aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-27 12:07:44 -0700
committerJunio C Hamano <gitster@pobox.com>2010-06-27 12:07:44 -0700
commita81f1a825bebe1b4d202832b804957d1547d7f60 (patch)
treea89891f5eb9092fbcd2e929cb591c6fb8791d5d5 /merge-recursive.h
parentf526d120f649ec4426b559e94e09655b5a4f2b87 (diff)
parent5853caec96a45ffa7768585acc649dc78eb99354 (diff)
downloadgit-a81f1a825bebe1b4d202832b804957d1547d7f60.tar.gz
git-a81f1a825bebe1b4d202832b804957d1547d7f60.tar.xz
Merge branch 'jn/show-num-walks'
* jn/show-num-walks: DWIM 'git show -5' to 'git show --do-walk -5'
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions