diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2006-01-28 02:38:19 -0800 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2006-01-28 02:38:19 -0800 |
| commit | fb56a964f2f60e657c136ccbf316f127d6d21c36 (patch) | |
| tree | 1173c604d9dfd5049170ad90c1b48fc58ff1fc94 /git-diff-files.txt | |
| parent | 9be1897ab8f6a7e90e1582acd9c43071d181c70f (diff) | |
| download | git-htmldocs-fb56a964f2f60e657c136ccbf316f127d6d21c36.tar.gz | |
Autogenerated HTML docs for v1.1.5-g3480
Diffstat (limited to 'git-diff-files.txt')
| -rw-r--r-- | git-diff-files.txt | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/git-diff-files.txt b/git-diff-files.txt index 67f51265e..481b8b3aa 100644 --- a/git-diff-files.txt +++ b/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 |