Add the --color-words option to the diff options family
[git/git.git] / Documentation / diff-options.txt
1 -p::
2 Generate patch (see section on generating patches)
3
4 -u::
5 Synonym for "-p".
6
7 --raw::
8 Generate the raw format.
9
10 --patch-with-raw::
11 Synonym for "-p --raw".
12
13 --stat::
14 Generate a diffstat.
15
16 --summary::
17 Output a condensed summary of extended header information
18 such as creations, renames and mode changes.
19
20 --patch-with-stat::
21 Synonym for "-p --stat".
22
23 -z::
24 \0 line termination on output
25
26 --name-only::
27 Show only names of changed files.
28
29 --name-status::
30 Show only names and status of changed files.
31
32 --color::
33 Show colored diff.
34
35 --no-color::
36 Turn off colored diff, even when the configuration file
37 gives the default to color output.
38
39 --color-words::
40 Show colored word diff, i.e. color words which have changed.
41
42 --no-renames::
43 Turn off rename detection, even when the configuration
44 file gives the default to do so.
45
46 --full-index::
47 Instead of the first handful characters, show full
48 object name of pre- and post-image blob on the "index"
49 line when generating a patch format output.
50
51 --binary::
52 In addition to --full-index, output "binary diff" that
53 can be applied with "git apply".
54
55 --abbrev[=<n>]::
56 Instead of showing the full 40-byte hexadecimal object
57 name in diff-raw format output and diff-tree header
58 lines, show only handful hexdigits prefix. This is
59 independent of --full-index option above, which controls
60 the diff-patch output format. Non default number of
61 digits can be specified with --abbrev=<n>.
62
63 -B::
64 Break complete rewrite changes into pairs of delete and create.
65
66 -M::
67 Detect renames.
68
69 -C::
70 Detect copies as well as renames.
71
72 --diff-filter=[ACDMRTUXB*]::
73 Select only files that are Added (`A`), Copied (`C`),
74 Deleted (`D`), Modified (`M`), Renamed (`R`), have their
75 type (mode) changed (`T`), are Unmerged (`U`), are
76 Unknown (`X`), or have had their pairing Broken (`B`).
77 Any combination of the filter characters may be used.
78 When `*` (All-or-none) is added to the combination, all
79 paths are selected if there is any file that matches
80 other criteria in the comparison; if there is no file
81 that matches other criteria, nothing is selected.
82
83 --find-copies-harder::
84 For performance reasons, by default, -C option finds copies only
85 if the original file of the copy was modified in the same
86 changeset. This flag makes the command
87 inspect unmodified files as candidates for the source of
88 copy. This is a very expensive operation for large
89 projects, so use it with caution.
90
91 -l<num>::
92 -M and -C options require O(n^2) processing time where n
93 is the number of potential rename/copy targets. This
94 option prevents rename/copy detection from running if
95 the number of rename/copy targets exceeds the specified
96 number.
97
98 -S<string>::
99 Look for differences that contain the change in <string>.
100
101 --pickaxe-all::
102 When -S finds a change, show all the changes in that
103 changeset, not just the files that contain the change
104 in <string>.
105
106 --pickaxe-regex::
107 Make the <string> not a plain string but an extended POSIX
108 regex to match.
109
110 -O<orderfile>::
111 Output the patch in the order specified in the
112 <orderfile>, which has one shell glob pattern per line.
113
114 -R::
115 Swap two inputs; that is, show differences from index or
116 on-disk file to tree contents.
117
118 --text::
119 Treat all files as text.
120
121 -a::
122 Shorthand for "--text".
123
124 For more detailed explanation on these common options, see also
125 link:diffcore.html[diffcore documentation].