summaryrefslogtreecommitdiff
path: root/git-commit-script
diff options
context:
space:
mode:
authorJunio C Hamano <junkio@cox.net>2006-11-26 12:47:52 -0800
committerJunio C Hamano <junkio@cox.net>2006-11-26 14:22:01 -0800
commit36f2587ffb6802cb38071510810f48cddfc4f34a (patch)
treeaeb2faed03da23899e3a1d278b0a66bfa7935c10 /git-commit-script
parentaabd76930fdc585dd3e198a3351d426583af4081 (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>
Diffstat (limited to 'git-commit-script')
0 files changed, 0 insertions, 0 deletions