diff options
| author | Paul Mackerras <paulus@samba.org> | 2006-09-04 21:38:40 +1000 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-09-05 00:13:25 -0700 |
| commit | cb2b9f5ee15547e878c668504140c66f3a42d81c (patch) | |
| tree | 2ddaff61d286bc79e9678de2e9183ed2e828b575 /git-merge-octopus.sh | |
| parent | 8f5d6b469fdb41d549fb8624a54dc62ff1760c41 (diff) | |
| download | git-cb2b9f5ee15547e878c668504140c66f3a42d81c.tar.gz git-cb2b9f5ee15547e878c668504140c66f3a42d81c.tar.xz | |
diff-index --cc shows a 3-way diff between HEAD, index and working tree.
This implements a 3-way diff between the HEAD commit, the state in the
index, and the working directory. This is like the n-way diff for a
merge, and uses much of the same code. It is invoked with the -c flag
to git-diff-index, which it already accepted and did nothing with.
Signed-off-by: Paul Mackerras <paulus@samba.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-merge-octopus.sh')
0 files changed, 0 insertions, 0 deletions