Merge branch 'jc/rename-degrade-cc-to-c' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:00:02 +0000 (12:00 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 31 May 2011 19:00:02 +0000 (12:00 -0700)
commitb3c8931...a33fbded4a8c5d533ca8ddc6087e4c23
tree804bd0c...40bcbd6c365460e5d60163b44cd8c200copy hash to clipboard (tree)
parente596fd2...5fbb6e7453cd541554ba27ab185f870dcopy hash to clipboard (diff)
parentf31027c...9cb2ec4eb7ad8d1ebc7f0e20fef4bd1dcopy hash to clipboard (diff)
builtin/diff.c
builtin/log.c
diff.c
diff.h
diffcore-rename.c
merge-recursive.c
t/t4001-diff-rename.sh