git.99rst.org / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 8f5d6b4)
diff-index --cc shows a 3-way diff between HEAD, index and working tree.
authorPaul Mackerras <redacted>
Mon, 4 Sep 2006 11:38:40 +0000 (21:38 +1000)
committerJunio C Hamano <redacted>
Tue, 5 Sep 2006 07:13:25 +0000 (00:13 -0700)
commitcb2b9f5ee15547e878c668504140c66f3a42d81c
tree2ddaff61d286bc79e9678de2e9183ed2e828b575tree | snapshot
parent8f5d6b469fdb41d549fb8624a54dc62ff1760c41commit | diff
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 <redacted>
Signed-off-by: Junio C Hamano <redacted>
diff-lib.c diff | blob | history
git clone https://git.99rst.org/PROJECT