X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=Documentation%2Fgit-diff-files.txt;h=5c8c1d95a89b15e936816f486a8114cbc6788fb9;hb=bb1dff9def343a7d513eea8f4eaa5fd7d5d3fc5f;hp=ed9bd75b7417a3024d20fda01b964fb6bbeaaa50;hpb=9e1f0a85c68323830ea117092c55192b17aa3ac8;p=git.git diff --git a/Documentation/git-diff-files.txt b/Documentation/git-diff-files.txt index ed9bd75b7..5c8c1d95a 100644 --- a/Documentation/git-diff-files.txt +++ b/Documentation/git-diff-files.txt @@ -8,14 +8,14 @@ git-diff-files - Compares files in the working tree and the index SYNOPSIS -------- -'git-diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [] [...] +'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [] [...] DESCRIPTION ----------- Compares the files in the working tree and the index. When paths are specified, compares only those named paths. Otherwise all entries in the index are compared. The output format is the -same as "git-diff-index" and "git-diff-tree". +same as for 'git-diff-index' and 'git-diff-tree'. OPTIONS ------- @@ -30,7 +30,8 @@ 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:: +-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