Johannes Sixt <j.sixt@xxxxxxxxxxxxx> writes: > No, it doesn't. Neither before nor after this change. (I actually thought it > would without this change, but I obviously was wrong.) Sorry, my mistake. "git grep" traditionally skips unmerged paths. It might make sense to grep in stage #2 if a path is unmerged, just like we use stage #2 in diff-files. - To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html