summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2010-06-22 16:04:14 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-06-22 16:27:07 (GMT)
commit3c656899cdfbfdd40987625c4615a8c941d5968a (patch)
tree547b892074d90da576a25066e3504af9c60460f5 /Documentation
parenta8c4d925caba244de842f8fa663c3e6bb7000b89 (diff)
parent296c6bb21a6980f6e5b42f0790d6365c1e3f696f (diff)
downloadgit-3c656899cdfbfdd40987625c4615a8c941d5968a.zip
git-3c656899cdfbfdd40987625c4615a8c941d5968a.tar.gz
git-3c656899cdfbfdd40987625c4615a8c941d5968a.tar.bz2
Merge branch 'cc/maint-diff-CC-binary' into maint
* cc/maint-diff-CC-binary: diff: fix "git show -C -C" output when renaming a binary file Conflicts: diff.c
Diffstat (limited to 'Documentation')
0 files changed, 0 insertions, 0 deletions