| commit | cb2b9f5ee15547e878c668504140c66f3a42d81c | |
| author | Paul Mackerras <paulus@samba.org> | |
| Mon, 4 Sep 2006 11:38:40 +0000 (4 21:38 +1000) | ||
| committer | Junio C Hamano <junkio@cox.net> | |
| Tue, 5 Sep 2006 07:13:25 +0000 (5 00:13 -0700) | ||
| tree | 2ddaff61d286bc79e9678de2e9183ed2e828b575 | treesnapshot (tar.gz zip) |
| parent | 8f5d6b469fdb41d549fb8624a54dc62ff1760c41 | commitdiff |
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>
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>
| diff-lib.c | diffblobblamehistory |