projects / thirdparty / git.git / blame
| 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 | -------- | |
| dda2d79a | 11 | 'git-diff-files' [-q] [<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 | + | |
| 15bf57a1 JH |
29 | The default is to diff against our branch (-2) and the |
| 30 | cleanly resolved paths. The option -0 can be given to | |
| 31 | omit diff output for unmerged entries and just show "Unmerged". | |
| 10637b84 | 32 | |
| 2cf565c5 DG |
33 | -q:: |
| 34 | Remain silent even on nonexisting files | |
| 35 | ||
| 2cf565c5 DG |
36 | Output format |
| 37 | ------------- | |
| 38 | include::diff-format.txt[] | |
| 39 | ||
| 40 | ||
| 41 | Author | |
| 42 | ------ | |
| 43 | Written by Linus Torvalds <torvalds@osdl.org> | |
| 44 | ||
| 45 | Documentation | |
| 46 | -------------- | |
| 47 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. | |
| 48 | ||
| 49 | GIT | |
| 50 | --- | |
| a7154e91 | 51 | Part of the gitlink:git[7] suite |
| 2cf565c5 | 52 |