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