summaryrefslogtreecommitdiff
path: root/git-merge-octopus.sh
diff options
context:
space:
mode:
authorLibravatar Linus Torvalds <torvalds@osdl.org>2006-02-07 10:26:41 -0800
committerLibravatar Junio C Hamano <junkio@cox.net>2006-02-07 13:19:50 -0800
commitdeb989b57d01cc1ed10ec245245a0e6214a16f87 (patch)
tree33e97337b9b4615b462bf2b7c56672882ee973fa /git-merge-octopus.sh
parentBasic documentation for git-show (diff)
downloadtgif-deb989b57d01cc1ed10ec245245a0e6214a16f87.tar.xz
Fix "git diff a..b" breakage
The "--cc" implies "-p", but without the recursive part. Linus Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions