aboutsummaryrefslogtreecommitdiff
path: root/merge-recursive.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2008-11-16 00:48:59 -0800
committerJunio C Hamano <gitster@pobox.com>2008-11-16 00:48:59 -0800
commit47a792539a48327e62c594f2befb5c5d1e58c0f2 (patch)
tree2a4cc395a0686640abea8b3fe75ff3667b7e0475 /merge-recursive.h
parent8c4021abfd170278d1a3431e2777bedd0c01fbb1 (diff)
parent1324fb6f161ee516eb4c597880847003a42c0c5d (diff)
downloadgit-47a792539a48327e62c594f2befb5c5d1e58c0f2.tar.gz
git-47a792539a48327e62c594f2befb5c5d1e58c0f2.tar.xz
Merge branch 'jk/commit-v-strip'
* jk/commit-v-strip: status: show "-v" diff even for initial commit wt-status: refactor initial commit printing define empty tree sha1 as a macro
Diffstat (limited to 'merge-recursive.h')
0 files changed, 0 insertions, 0 deletions