projects / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: aabd769) | patch
grep: do not skip unmerged entries when grepping in the working tree.
authorJunio C Hamano <junkio@cox.net>
Sun, 26 Nov 2006 20:47:52 +0000 (12:47 -0800)
committerJunio C Hamano <junkio@cox.net>
Sun, 26 Nov 2006 22:22:01 +0000 (14:22 -0800)
commit36f2587ffb6802cb38071510810f48cddfc4f34a
treeaeb2faed03da23899e3a1d278b0a66bfa7935c10tree | snapshot
parentaabd76930fdc585dd3e198a3351d426583af4081commit | diff
grep: do not skip unmerged entries when grepping in the working tree.

We used to skip unmerged entries, which made sense for grepping
in the cached copies, but not for grepping in the working tree.

Noticed by Johannes Sixt.

Signed-off-by: Junio C Hamano <junkio@cox.net>
builtin-grep.c diff | blob | history
Git—the stupid content tracker