/ uis / git / x / uis / git / git.git / blame
| Commit | Line | Data |
|---|---|---|
| 2cf565c5 DG |
1 | git-diff-files(1) |
| 2 | ================= | |
| 3 | v0.1, May 2005 | |
| 4 | ||
| 5 | NAME | |
| 6 | ---- | |
| 7 | git-diff-files - Compares files in the working tree and the cache | |
| 8 | ||
| 9 | ||
| 10 | SYNOPSIS | |
| 11 | -------- | |
| af5323e0 | 12 | 'git-diff-files' [-p] [-q] [-r] [-z] [-B] [-M] [-C] [-R] [-O<orderfile>] [-S<string>] [--pickaxe-all] [<pattern>...] |
| 2cf565c5 DG |
13 | |
| 14 | DESCRIPTION | |
| 15 | ----------- | |
| 16 | Compares the files in the working tree and the cache. When paths | |
| 17 | are specified, compares only those named paths. Otherwise all | |
| 18 | entries in the cache are compared. The output format is the | |
| 19 | same as "git-diff-cache" and "git-diff-tree". | |
| 20 | ||
| 21 | OPTIONS | |
| 22 | ------- | |
| 23 | -p:: | |
| 24 | generate patch (see section on generating patches). | |
| 25 | ||
| 26 | -q:: | |
| 27 | Remain silent even on nonexisting files | |
| 28 | ||
| 57fe64a4 JH |
29 | -R:: |
| 30 | Output diff in reverse. | |
| 31 | ||
| f345b0a0 JH |
32 | -B:: |
| 33 | Break complete rewrite changes into pairs of delete and create. | |
| 34 | ||
| 5c97558c | 35 | -M:: |
| 81e50eab | 36 | Detect renames. |
| 5c97558c | 37 | |
| 427dcb4b | 38 | -C:: |
| 81e50eab | 39 | Detect copies as well as renames. |
| 427dcb4b | 40 | |
| 52e95789 JH |
41 | -S<string>:: |
| 42 | Look for differences that contains the change in <string>. | |
| 43 | ||
| e25de756 JH |
44 | --pickaxe-all:: |
| 45 | When -S finds a change, show all the changes in that | |
| 46 | changeset, not just the files that contains the change | |
| 47 | in <string>. | |
| 52e95789 | 48 | |
| af5323e0 JH |
49 | -O<orderfile>:: |
| 50 | Output the patch in the order specified in the | |
| 51 | <orderfile>, which has one shell glob pattern per line. | |
| 52 | ||
| 2cf565c5 DG |
53 | -r:: |
| 54 | This flag does not mean anything. It is there only to match | |
| 55 | git-diff-tree. Unlike git-diff-tree, git-diff-files always looks | |
| 56 | at all the subdirectories. | |
| 57 | ||
| 58 | ||
| 59 | Output format | |
| 60 | ------------- | |
| 61 | include::diff-format.txt[] | |
| 62 | ||
| 63 | ||
| 64 | Author | |
| 65 | ------ | |
| 66 | Written by Linus Torvalds <torvalds@osdl.org> | |
| 67 | ||
| 68 | Documentation | |
| 69 | -------------- | |
| 70 | Documentation by David Greaves, Junio C Hamano and the git-list <git@vger.kernel.org>. | |
| 71 | ||
| 72 | GIT | |
| 73 | --- | |
| 74 | Part of the link:git.html[git] suite | |
| 75 |