diff options
| author | Junio C Hamano <junkio@cox.net> | 2006-01-28 02:19:22 -0800 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-01-28 02:26:30 -0800 |
| commit | 34801cab72e8262d2585f72f15b62a397f0c6c1a (patch) | |
| tree | f2d70aecfac97534deb3ac925c45df3819986e66 /Documentation/git-diff-files.txt | |
| parent | 939aabbf7d108b5d6830bf5cd89abc910cc9ff27 (diff) | |
| download | git-34801cab72e8262d2585f72f15b62a397f0c6c1a.tar.gz git-34801cab72e8262d2585f72f15b62a397f0c6c1a.tar.xz | |
Documentation: diff -c/--cc
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-diff-files.txt')
| -rw-r--r-- | Documentation/git-diff-files.txt | 8 |
1 files changed, 7 insertions, 1 deletions
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] [<common diff options>] [<path>...] +'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...] 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 |