From 34801cab72e8262d2585f72f15b62a397f0c6c1a Mon Sep 17 00:00:00 2001 From: Junio C Hamano Date: Sat, 28 Jan 2006 02:19:22 -0800 Subject: Documentation: diff -c/--cc Signed-off-by: Junio C Hamano --- Documentation/git-diff-files.txt | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) (limited to 'Documentation/git-diff-files.txt') diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index 67f51265e..481b8b3aa 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -8,7 +8,7 @@ git-diff-files - Compares files in the working tree and the index SYNOPSIS -------- -'git-diff-files' [-q] [] [...] +'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [] [...] DESCRIPTION ----------- @@ -30,6 +30,12 @@ The default is to diff against our branch (-2) and the cleanly resolved paths. The option -0 can be given to omit diff output for unmerged entries and just show "Unmerged". +-c,--cc:: + This compares stage 2 (our branch), stage 3 (their + branch) and the working tree file and outputs a combined + diff, similar to the way 'diff-tree' shows a merge + commit with these flags. + -q:: Remain silent even on nonexisting files -- cgit v1.2.1