rebase -X: do not clobber strategy
[git/git.git] / Documentation / diff-options.txt
CommitLineData
c1a95fa6
SO
1// Please don't remove this comment as asciidoc behaves badly when
2// the first non-empty line is ifdef/ifndef. The symptom is that
3// without this comment the <git-diff-core> attribute conditionally
4// defined below ends up being defined unconditionally.
5// Last checked with asciidoc 7.0.2.
6
7ifndef::git-format-patch[]
8ifndef::git-diff[]
272bd3cf 9ifndef::git-log[]
c1a95fa6 10:git-diff-core: 1
272bd3cf 11endif::git-log[]
c1a95fa6
SO
12endif::git-diff[]
13endif::git-format-patch[]
14
15ifdef::git-format-patch[]
16-p::
2cfa8330 17--no-stat::
02bc5b03 18 Generate plain patches without any diffstats.
c1a95fa6
SO
19endif::git-format-patch[]
20
21ifndef::git-format-patch[]
dda2d79a 22-p::
a9e67c8c 23-u::
1c9eecff 24--patch::
c1a95fa6
SO
25 Generate patch (see section on generating patches).
26 {git-diff? This is the default.}
27endif::git-format-patch[]
dda2d79a 28
4eb99473 29-U<n>::
4eb99473
RR
30--unified=<n>::
31 Generate diffs with <n> lines of context instead of
02bc5b03
BG
32 the usual three.
33ifndef::git-format-patch[]
dce5ef14 34 Implies `-p`.
02bc5b03 35endif::git-format-patch[]
4eb99473 36
d4cb003f 37ifndef::git-format-patch[]
b5376648
JH
38--raw::
39 Generate the raw format.
c1a95fa6 40 {git-diff-core? This is the default.}
d4cb003f 41endif::git-format-patch[]
b5376648 42
02bc5b03 43ifndef::git-format-patch[]
5c91da25 44--patch-with-raw::
dce5ef14 45 Synonym for `-p --raw`.
02bc5b03 46endif::git-format-patch[]
5c91da25 47
ec74042d 48--patience::
34292bdd
JS
49 Generate a diff using the "patience diff" algorithm.
50
62b4698e 51--stat[=<width>[,<name-width>]]::
5c5b2ea9 52 Generate a diffstat. You can override the default
62b4698e 53 output width for 80-column terminal by `--stat=<width>`.
5c5b2ea9
LT
54 The width of the filename part can be controlled by
55 giving another width to it separated by a comma.
d75f7952 56
74e2abe5 57--numstat::
dce5ef14 58 Similar to `\--stat`, but shows number of added and
74e2abe5 59 deleted lines in decimal notation and pathname without
2f89543e
JH
60 abbreviation, to make it more machine friendly. For
61 binary files, outputs two `-` instead of saying
62 `0 0`.
74e2abe5 63
ebd124c6 64--shortstat::
dce5ef14 65 Output only the last line of the `--stat` format containing total
ebd124c6
NP
66 number of modified files, as well as number of added and deleted
67 lines.
68
62b4698e 69--dirstat[=<limit>]::
62e00b0a
HO
70 Output the distribution of relative amount of changes (number of lines added or
71 removed) for each sub-directory. Directories with changes below
72 a cut-off percent (3% by default) are not shown. The cut-off percent
62b4698e 73 can be set with `--dirstat=<limit>`. Changes in a child directory are not
dce5ef14 74 counted for the parent directory, unless `--cumulative` is used.
37152d83 75
62b4698e 76--dirstat-by-file[=<limit>]::
dce5ef14 77 Same as `--dirstat`, but counts changed files instead of lines.
fd33777b 78
4bbd261b
SE
79--summary::
80 Output a condensed summary of extended header information
81 such as creations, renames and mode changes.
82
02bc5b03 83ifndef::git-format-patch[]
29353273 84--patch-with-stat::
dce5ef14 85 Synonym for `-p --stat`.
02bc5b03 86endif::git-format-patch[]
29353273 87
d4cb003f 88ifndef::git-format-patch[]
64485b4a 89
dda2d79a 90-z::
5c931c8d
BG
91ifdef::git-log[]
92 Separate the commits with NULs instead of with new newlines.
93+
94Also, when `--raw` or `--numstat` has been given, do not munge
95pathnames and use NULs as output field terminators.
96endif::git-log[]
64485b4a 97ifndef::git-log[]
03aa87ed
CB
98 When `--raw`, `--numstat`, `--name-only` or `--name-status` has been
99 given, do not munge pathnames and use NULs as output field terminators.
5c931c8d 100endif::git-log[]
64485b4a
BG
101+
102Without this option, each pathname output will have TAB, LF, double quotes,
103and backslash characters replaced with `\t`, `\n`, `\"`, and `\\`,
104respectively, and the pathname will be enclosed in double quotes if
105any of those replacements occurred.
dda2d79a
JH
106
107--name-only::
108 Show only names of changed files.
109
946f5f7c 110--name-status::
a6f47b2b
MV
111 Show only names and status of changed files. See the description
112 of the `--diff-filter` option on what the status letters mean.
dda2d79a 113
752c0c24
JS
114--submodule[=<format>]::
115 Chose the output format for submodule differences. <format> can be one of
116 'short' and 'log'. 'short' just shows pairs of commit names, this format
117 is used when this option is not given. 'log' is the default value for this
118 option and lists the commits in that commit range like the 'summary'
119 option of linkgit:git-submodule[1] does.
120
73e9da01 121--color[=<when>]::
b5376648 122 Show colored diff.
73e9da01 123 The value must be always (the default), never, or auto.
b5376648
JH
124
125--no-color::
126 Turn off colored diff, even when the configuration file
127 gives the default to color output.
73e9da01 128 Same as `--color=never`.
b5376648 129
882749a0
TR
130--word-diff[=<mode>]::
131 Show a word diff, using the <mode> to delimit changed words.
132 By default, words are delimited by whitespace; see
133 `--word-diff-regex` below. The <mode> defaults to 'plain', and
134 must be one of:
135+
136--
137color::
138 Highlight changed words using only colors. Implies `--color`.
139plain::
140 Show words as `[-removed-]` and `{+added+}`. Makes no
141 attempts to escape the delimiters if they appear in the input,
142 so the output may be ambiguous.
143porcelain::
144 Use a special line-based format intended for script
145 consumption. Added/removed/unchanged runs are printed in the
146 usual unified diff format, starting with a `+`/`-`/` `
147 character at the beginning of the line and extending to the
148 end of the line. Newlines in the input are represented by a
149 tilde `~` on a line of its own.
150none::
151 Disable word diff again.
152--
153+
154Note that despite the name of the first mode, color is used to
155highlight the changed parts in all modes if enabled.
156
157--word-diff-regex=<regex>::
158 Use <regex> to decide what a word is, instead of considering
159 runs of non-whitespace to be a word. Also implies
160 `--word-diff` unless it was already enabled.
2b6a5417 161+
882749a0 162Every non-overlapping match of the
c4b252c3
TR
163<regex> is considered a word. Anything between these matches is
164considered whitespace and ignored(!) for the purposes of finding
165differences. You may want to append `|[^[:space:]]` to your regular
166expression to make sure that it matches all non-whitespace characters.
167A match that contains a newline is silently truncated(!) at the
168newline.
80c49c3d 169+
98a4d87b
BSSJ
170The regex can also be set via a diff driver or configuration option, see
171linkgit:gitattributes[1] or linkgit:git-config[1]. Giving it explicitly
172overrides any diff driver or configuration setting. Diff drivers
173override configuration settings.
882749a0
TR
174
175--color-words[=<regex>]::
176 Equivalent to `--word-diff=color` plus (if a regex was
177 specified) `--word-diff-regex=<regex>`.
d4cb003f 178endif::git-format-patch[]
f59a59e2 179
b5376648
JH
180--no-renames::
181 Turn off rename detection, even when the configuration
182 file gives the default to do so.
183
02bc5b03 184ifndef::git-format-patch[]
16507fcf
BL
185--check::
186 Warn if changes introduce trailing whitespace
62c64895
WC
187 or an indent that uses a space before a tab. Exits with
188 non-zero status if problems are found. Not compatible with
189 --exit-code.
02bc5b03 190endif::git-format-patch[]
16507fcf 191
80b1e511 192--full-index::
6457e58c
JM
193 Instead of the first handful of characters, show the full
194 pre- and post-image blob object names on the "index"
195 line when generating patch format output.
b5376648
JH
196
197--binary::
dce5ef14
BG
198 In addition to `--full-index`, output a binary diff that
199 can be applied with `git-apply`.
80b1e511 200
913419fc 201--abbrev[=<n>]::
47dd0d59
JH
202 Instead of showing the full 40-byte hexadecimal object
203 name in diff-raw format output and diff-tree header
323b9db8 204 lines, show only a partial prefix. This is
dce5ef14 205 independent of the `--full-index` option above, which controls
913419fc 206 the diff-patch output format. Non default number of
dce5ef14 207 digits can be specified with `--abbrev=<n>`.
47dd0d59 208
cf958afd
MM
209-B[<n>][/<m>]::
210 Break complete rewrite changes into pairs of delete and
211 create. This serves two purposes:
212+
213It affects the way a change that amounts to a total rewrite of a file
214not as a series of deletion and insertion mixed together with a very
215few lines that happen to match textually as the context, but as a
216single deletion of everything old followed by a single insertion of
217everything new, and the number `m` controls this aspect of the -B
218option (defaults to 60%). `-B/70%` specifies that less than 30% of the
219original should remain in the result for git to consider it a total
220rewrite (i.e. otherwise the resulting patch will be a series of
221deletion and insertion mixed together with context lines).
222+
223When used with -M, a totally-rewritten file is also considered as the
224source of a rename (usually -M only considers a file that disappeared
225as the source of a rename), and the number `n` controls this aspect of
226the -B option (defaults to 50%). `-B20%` specifies that a change with
227addition and deletion compared to 20% or more of the file's size are
228eligible for being picked up as a possible source of a rename to
229another file.
230
231-M[<n>]::
7ffad250 232ifndef::git-log[]
dda2d79a 233 Detect renames.
7ffad250
JK
234endif::git-log[]
235ifdef::git-log[]
236 If generating diffs, detect and report renames for each commit.
237 For following files across renames while traversing history, see
238 `--follow`.
239endif::git-log[]
cf958afd
MM
240 If `n` is specified, it is a is a threshold on the similarity
241 index (i.e. amount of addition/deletions compared to the
242 file's size). For example, `-M90%` means git should consider a
243 delete/add pair to be a rename if more than 90% of the file
244 hasn't changed.
dda2d79a 245
cf958afd 246-C[<n>]::
ca6c0970 247 Detect copies as well as renames. See also `--find-copies-harder`.
cf958afd 248 If `n` is specified, it has the same meaning as for `-M<n>`.
dda2d79a 249
d4cb003f 250ifndef::git-format-patch[]
01398df3 251--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::
147cf317
JL
252 Select only files that are Added (`A`), Copied (`C`),
253 Deleted (`D`), Modified (`M`), Renamed (`R`), have their
f07c3c53
JH
254 type (i.e. regular file, symlink, submodule, ...) changed (`T`),
255 are Unmerged (`U`), are
147cf317 256 Unknown (`X`), or have had their pairing Broken (`B`).
01398df3 257 Any combination of the filter characters (including none) can be used.
147cf317
JL
258 When `*` (All-or-none) is added to the combination, all
259 paths are selected if there is any file that matches
260 other criteria in the comparison; if there is no file
261 that matches other criteria, nothing is selected.
d4cb003f 262endif::git-format-patch[]
147cf317 263
dda2d79a 264--find-copies-harder::
ca6c0970 265 For performance reasons, by default, `-C` option finds copies only
a6080a0a 266 if the original file of the copy was modified in the same
f73ae1fc 267 changeset. This flag makes the command
dda2d79a
JH
268 inspect unmodified files as candidates for the source of
269 copy. This is a very expensive operation for large
ca6c0970
JS
270 projects, so use it with caution. Giving more than one
271 `-C` option has the same effect.
dda2d79a 272
8082d8d3 273-l<num>::
dce5ef14 274 The `-M` and `-C` options require O(n^2) processing time where n
f73ae1fc 275 is the number of potential rename/copy targets. This
8082d8d3 276 option prevents rename/copy detection from running if
f73ae1fc 277 the number of rename/copy targets exceeds the specified
8082d8d3
JH
278 number.
279
d4cb003f 280ifndef::git-format-patch[]
dda2d79a 281-S<string>::
821d56aa
JK
282 Look for differences that introduce or remove an instance of
283 <string>. Note that this is different than the string simply
284 appearing in diff output; see the 'pickaxe' entry in
285 linkgit:gitdiffcore[7] for more details.
dda2d79a
JH
286
287--pickaxe-all::
dce5ef14 288 When `-S` finds a change, show all the changes in that
f73ae1fc 289 changeset, not just the files that contain the change
dda2d79a
JH
290 in <string>.
291
d01d8c67
PB
292--pickaxe-regex::
293 Make the <string> not a plain string but an extended POSIX
294 regex to match.
d4cb003f 295endif::git-format-patch[]
d01d8c67 296
dda2d79a
JH
297-O<orderfile>::
298 Output the patch in the order specified in the
299 <orderfile>, which has one shell glob pattern per line.
300
d4cb003f 301ifndef::git-format-patch[]
dda2d79a 302-R::
5f3aa197 303 Swap two inputs; that is, show differences from index or
dda2d79a
JH
304 on-disk file to tree contents.
305
c0cb4a06 306--relative[=<path>]::
cd676a51
JH
307 When run from a subdirectory of the project, it can be
308 told to exclude changes outside the directory and show
c0cb4a06
JH
309 pathnames relative to it with this option. When you are
310 not in a subdirectory (e.g. in a bare repository), you
311 can name which subdirectory to make the output relative
312 to by giving a <path> as an argument.
d4cb003f 313endif::git-format-patch[]
cd676a51 314
a9e67c8c 315-a::
d507bb15
SF
316--text::
317 Treat all files as text.
318
a44a0c99 319--ignore-space-at-eol::
0ac7903e 320 Ignore changes in whitespace at EOL.
a44a0c99 321
a9e67c8c 322-b::
8ebe185b 323--ignore-space-change::
0ac7903e
WC
324 Ignore changes in amount of whitespace. This ignores whitespace
325 at line end, and considers all other sequences of one or
326 more whitespace characters to be equivalent.
8ebe185b 327
a9e67c8c 328-w::
8ebe185b 329--ignore-all-space::
0ac7903e
WC
330 Ignore whitespace when comparing lines. This ignores
331 differences even if one line has whitespace where the other
8ebe185b
JN
332 line has none.
333
6d0e674a
RS
334--inter-hunk-context=<lines>::
335 Show the context between diff hunks, up to the specified number
336 of lines, thereby fusing hunks that are close to each other.
337
d4cb003f 338ifndef::git-format-patch[]
41bbf9d5
AR
339--exit-code::
340 Make the program exit with codes similar to diff(1).
341 That is, it exits with 1 if there were differences and
342 0 means no differences.
343
2a18c266 344--quiet::
dce5ef14 345 Disable all output of the program. Implies `--exit-code`.
d4cb003f 346endif::git-format-patch[]
2a18c266 347
72909bef
JS
348--ext-diff::
349 Allow an external diff helper to be executed. If you set an
5162e697
DM
350 external diff driver with linkgit:gitattributes[5], you need
351 to use this option with linkgit:git-log[1] and friends.
72909bef
JS
352
353--no-ext-diff::
354 Disallow external diff drivers.
355
dd44d419
JL
356--ignore-submodules[=<when>]::
357 Ignore changes to submodules in the diff generation. <when> can be
aee9c7d6
JL
358 either "none", "untracked", "dirty" or "all", which is the default
359 Using "none" will consider the submodule modified when it either contains
360 untracked or modified files or its HEAD differs from the commit recorded
361 in the superproject and can be used to override any settings of the
302ad7a9 362 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When
dd44d419
JL
363 "untracked" is used submodules are not considered dirty when they only
364 contain untracked content (but they are still scanned for modified
365 content). Using "dirty" ignores all changes to the work tree of submodules,
366 only changes to the commits stored in the superproject are shown (this was
367 the behavior until 1.7.0). Using "all" hides all changes to submodules.
50fd9bd8 368
eab9a40b
JS
369--src-prefix=<prefix>::
370 Show the given source prefix instead of "a/".
371
372--dst-prefix=<prefix>::
373 Show the given destination prefix instead of "b/".
374
375--no-prefix::
376 Do not show any source or destination prefix.
377
8db9307c 378For more detailed explanation on these common options, see also
6998e4db 379linkgit:gitdiffcore[7].