]>
Commit | Line | Data |
---|---|---|
dda2d79a JH |
1 | -p:: |
2 | Generate patch (see section on generating patches) | |
3 | ||
4 | -u:: | |
5 | Synonym for "-p". | |
6 | ||
7 | -r:: | |
2c6e4771 | 8 | Look recursively in subdirectories; this flag does not |
dda2d79a | 9 | mean anything to commands other than "git-diff-tree"; |
2c6e4771 | 10 | other diff commands always look at all the subdirectories. |
dda2d79a JH |
11 | |
12 | -z:: | |
13 | \0 line termination on output | |
14 | ||
15 | --name-only:: | |
16 | Show only names of changed files. | |
17 | ||
946f5f7c JH |
18 | --name-status:: |
19 | Show only names and status of changed files. | |
dda2d79a JH |
20 | |
21 | -B:: | |
22 | Break complete rewrite changes into pairs of delete and create. | |
23 | ||
24 | -M:: | |
25 | Detect renames. | |
26 | ||
27 | -C:: | |
28 | Detect copies as well as renames. | |
29 | ||
30 | --find-copies-harder:: | |
31 | By default, -C option finds copies only if the original | |
32 | file of the copy was modified in the same changeset for | |
33 | performance reasons. This flag makes the command | |
34 | inspect unmodified files as candidates for the source of | |
35 | copy. This is a very expensive operation for large | |
36 | projects, so use it with caution. | |
37 | ||
8082d8d3 JH |
38 | -l<num>:: |
39 | -M and -C options require O(n^2) processing time where n | |
40 | in the number of potential rename/copy targets. This | |
41 | option prevents rename/copy detection from running if | |
42 | the number of rename/copy targets exceed the specified | |
43 | number. | |
44 | ||
dda2d79a JH |
45 | -S<string>:: |
46 | Look for differences that contains the change in <string>. | |
47 | ||
48 | --pickaxe-all:: | |
49 | When -S finds a change, show all the changes in that | |
50 | changeset, not just the files that contains the change | |
51 | in <string>. | |
52 | ||
53 | -O<orderfile>:: | |
54 | Output the patch in the order specified in the | |
55 | <orderfile>, which has one shell glob pattern per line. | |
56 | ||
57 | -R:: | |
58 | Swap two inputs; that is, show differences from cache or | |
59 | on-disk file to tree contents. | |
60 | ||
8db9307c JH |
61 | For more detailed explanation on these common options, see also |
62 | link:diffcore.html[diffcore documentation]. |