summaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2009-01-28 23:42:41 -0800
committerLibravatar Junio C Hamano <gitster@pobox.com>2009-01-28 23:42:41 -0800
commitf9686cdc23f143abe111c15c22dd1c2b3c33fd67 (patch)
treea980a3c1cf645a98ae31a4c5cdea2ff76bcd7845 /merge-recursive.h
parentMerge branch 'jc/maint-ls-tree' into maint (diff)
parentgrep: grep cache entries if they are "assume unchanged" (diff)
downloadtgif-f9686cdc23f143abe111c15c22dd1c2b3c33fd67.tar.xz
Merge branch 'nd/grep-assume-unchanged' into maint
* nd/grep-assume-unchanged: grep: grep cache entries if they are "assume unchanged" grep: support --no-ext-grep to test builtin grep
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions