| commit | 36f2587ffb6802cb38071510810f48cddfc4f34a | |
| author | Junio C Hamano <junkio@cox.net> | |
| Sun, 26 Nov 2006 20:47:52 +0000 (26 12:47 -0800) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Sun, 26 Nov 2006 22:22:01 +0000 (26 14:22 -0800) | ||
| tree | aeb2faed03da23899e3a1d278b0a66bfa7935c10 | treesnapshot (tar.gz zip) |
| parent | aabd76930fdc585dd3e198a3351d426583af4081 | commitdiff |
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>
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 | diffblobblamehistory |