Documentation: let asciidoc align related options
[git/git.git] / Documentation / git-diff-files.txt
1 git-diff-files(1)
2 =================
3
4 NAME
5 ----
6 git-diff-files - Compares files in the working tree and the index
7
8
9 SYNOPSIS
10 --------
11 'git diff-files' [-q] [-0|-1|-2|-3|-c|--cc] [<common diff options>] [<path>...]
12
13 DESCRIPTION
14 -----------
15 Compares the files in the working tree and the index. When paths
16 are specified, compares only those named paths. Otherwise all
17 entries in the index are compared. The output format is the
18 same as for 'git-diff-index' and 'git-diff-tree'.
19
20 OPTIONS
21 -------
22 include::diff-options.txt[]
23
24 -1 --base::
25 -2 --ours::
26 -3 --theirs::
27 -0::
28 Diff against the "base" version, "our branch" or "their
29 branch" respectively. With these options, diffs for
30 merged entries are not shown.
31 +
32 The default is to diff against our branch (-2) and the
33 cleanly resolved paths. The option -0 can be given to
34 omit diff output for unmerged entries and just show "Unmerged".
35
36 -c::
37 --cc::
38 This compares stage 2 (our branch), stage 3 (their
39 branch) and the working tree file and outputs a combined
40 diff, similar to the way 'diff-tree' shows a merge
41 commit with these flags.
42
43 -q::
44 Remain silent even on nonexistent files
45
46 Output format
47 -------------
48 include::diff-format.txt[]
49
50
51 Author
52 ------
53 Written by Linus Torvalds <torvalds@osdl.org>
54
55 Documentation
56 --------------
57 Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>.
58
59 GIT
60 ---
61 Part of the linkgit:git[1] suite