]>
Commit | Line | Data |
---|---|---|
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 | ||
7 | ifndef::git-format-patch[] | |
8 | ifndef::git-diff[] | |
272bd3cf | 9 | ifndef::git-log[] |
c1a95fa6 | 10 | :git-diff-core: 1 |
272bd3cf | 11 | endif::git-log[] |
c1a95fa6 SO |
12 | endif::git-diff[] |
13 | endif::git-format-patch[] | |
14 | ||
15 | ifdef::git-format-patch[] | |
16 | -p:: | |
2cfa8330 | 17 | --no-stat:: |
02bc5b03 | 18 | Generate plain patches without any diffstats. |
c1a95fa6 SO |
19 | endif::git-format-patch[] |
20 | ||
21 | ifndef::git-format-patch[] | |
dda2d79a | 22 | -p:: |
a9e67c8c | 23 | -u:: |
1c9eecff | 24 | --patch:: |
c1a95fa6 | 25 | Generate patch (see section on generating patches). |
d0258b93 JK |
26 | ifdef::git-diff[] |
27 | This is the default. | |
28 | endif::git-diff[] | |
dda2d79a | 29 | |
7b02c834 MM |
30 | -s:: |
31 | --no-patch:: | |
32 | Suppress diff output. Useful for commands like `git show` that | |
33 | show the patch by default, or to cancel the effect of `--patch`. | |
b73a1bcc | 34 | endif::git-format-patch[] |
7b02c834 | 35 | |
4eb99473 | 36 | -U<n>:: |
4eb99473 RR |
37 | --unified=<n>:: |
38 | Generate diffs with <n> lines of context instead of | |
02bc5b03 BG |
39 | the usual three. |
40 | ifndef::git-format-patch[] | |
dce5ef14 | 41 | Implies `-p`. |
02bc5b03 | 42 | endif::git-format-patch[] |
4eb99473 | 43 | |
d4cb003f | 44 | ifndef::git-format-patch[] |
b5376648 | 45 | --raw:: |
d89df367 MM |
46 | ifndef::git-log[] |
47 | Generate the diff in raw format. | |
d0258b93 JK |
48 | ifdef::git-diff-core[] |
49 | This is the default. | |
50 | endif::git-diff-core[] | |
d89df367 MM |
51 | endif::git-log[] |
52 | ifdef::git-log[] | |
53 | For each commit, show a summary of changes using the raw diff | |
54 | format. See the "RAW OUTPUT FORMAT" section of | |
55 | linkgit:git-diff[1]. This is different from showing the log | |
56 | itself in raw format, which you can achieve with | |
57 | `--format=raw`. | |
58 | endif::git-log[] | |
d4cb003f | 59 | endif::git-format-patch[] |
b5376648 | 60 | |
02bc5b03 | 61 | ifndef::git-format-patch[] |
5c91da25 | 62 | --patch-with-raw:: |
dce5ef14 | 63 | Synonym for `-p --raw`. |
02bc5b03 | 64 | endif::git-format-patch[] |
5c91da25 | 65 | |
5b162879 | 66 | include::diff-heuristic-options.txt[] |
5580b271 | 67 | |
81b568c8 JH |
68 | --minimal:: |
69 | Spend extra time to make sure the smallest possible | |
70 | diff is produced. | |
71 | ||
ec74042d | 72 | --patience:: |
34292bdd JS |
73 | Generate a diff using the "patience diff" algorithm. |
74 | ||
d909e076 TR |
75 | --histogram:: |
76 | Generate a diff using the "histogram diff" algorithm. | |
77 | ||
07924d4d MP |
78 | --diff-algorithm={patience|minimal|histogram|myers}:: |
79 | Choose a diff algorithm. The variants are as follows: | |
80 | + | |
81 | -- | |
82 | `default`, `myers`;; | |
83 | The basic greedy diff algorithm. Currently, this is the default. | |
84 | `minimal`;; | |
85 | Spend extra time to make sure the smallest possible diff is | |
86 | produced. | |
87 | `patience`;; | |
88 | Use "patience diff" algorithm when generating patches. | |
89 | `histogram`;; | |
90 | This algorithm extends the patience algorithm to "support | |
91 | low-occurrence common elements". | |
92 | -- | |
93 | + | |
94 | For instance, if you configured diff.algorithm variable to a | |
95 | non-default value and want to use the default one, then you | |
96 | have to use `--diff-algorithm=default` option. | |
97 | ||
808e1db2 | 98 | --stat[=<width>[,<name-width>[,<count>]]]:: |
1b058bc3 | 99 | Generate a diffstat. By default, as much space as necessary |
df44483a ZJS |
100 | will be used for the filename part, and the rest for the graph |
101 | part. Maximum width defaults to terminal width, or 80 columns | |
8d8136c3 | 102 | if not connected to a terminal, and can be overridden by |
df44483a ZJS |
103 | `<width>`. The width of the filename part can be limited by |
104 | giving another width `<name-width>` after a comma. The width | |
105 | of the graph part can be limited by using | |
106 | `--stat-graph-width=<width>` (affects all commands generating | |
107 | a stat graph) or by setting `diff.statGraphWidth=<width>` | |
108 | (does not affect `git format-patch`). | |
808e1db2 | 109 | By giving a third parameter `<count>`, you can limit the |
1b058bc3 ZJS |
110 | output to the first `<count>` lines, followed by `...` if |
111 | there are more. | |
86e1ce96 MG |
112 | + |
113 | These parameters can also be set individually with `--stat-width=<width>`, | |
114 | `--stat-name-width=<name-width>` and `--stat-count=<count>`. | |
d75f7952 | 115 | |
74e2abe5 | 116 | --numstat:: |
6cf378f0 | 117 | Similar to `--stat`, but shows number of added and |
74e2abe5 | 118 | deleted lines in decimal notation and pathname without |
2f89543e JH |
119 | abbreviation, to make it more machine friendly. For |
120 | binary files, outputs two `-` instead of saying | |
121 | `0 0`. | |
74e2abe5 | 122 | |
ebd124c6 | 123 | --shortstat:: |
dce5ef14 | 124 | Output only the last line of the `--stat` format containing total |
ebd124c6 NP |
125 | number of modified files, as well as number of added and deleted |
126 | lines. | |
127 | ||
333f3fb0 JH |
128 | --dirstat[=<param1,param2,...>]:: |
129 | Output the distribution of relative amount of changes for each | |
130 | sub-directory. The behavior of `--dirstat` can be customized by | |
131 | passing it a comma separated list of parameters. | |
2d174951 JH |
132 | The defaults are controlled by the `diff.dirstat` configuration |
133 | variable (see linkgit:git-config[1]). | |
333f3fb0 | 134 | The following parameters are available: |
204f01a2 | 135 | + |
333f3fb0 JH |
136 | -- |
137 | `changes`;; | |
138 | Compute the dirstat numbers by counting the lines that have been | |
139 | removed from the source, or added to the destination. This ignores | |
140 | the amount of pure code movements within a file. In other words, | |
141 | rearranging lines in a file is not counted as much as other changes. | |
142 | This is the default behavior when no parameter is given. | |
1c57a627 JH |
143 | `lines`;; |
144 | Compute the dirstat numbers by doing the regular line-based diff | |
145 | analysis, and summing the removed/added line counts. (For binary | |
146 | files, count 64-byte chunks instead, since binary files have no | |
147 | natural concept of lines). This is a more expensive `--dirstat` | |
148 | behavior than the `changes` behavior, but it does count rearranged | |
149 | lines within a file as much as other changes. The resulting output | |
150 | is consistent with what you get from the other `--*stat` options. | |
333f3fb0 JH |
151 | `files`;; |
152 | Compute the dirstat numbers by counting the number of files changed. | |
153 | Each changed file counts equally in the dirstat analysis. This is | |
154 | the computationally cheapest `--dirstat` behavior, since it does | |
155 | not have to look at the file contents at all. | |
156 | `cumulative`;; | |
157 | Count changes in a child directory for the parent directory as well. | |
158 | Note that when using `cumulative`, the sum of the percentages | |
159 | reported may exceed 100%. The default (non-cumulative) behavior can | |
160 | be specified with the `noncumulative` parameter. | |
161 | <limit>;; | |
162 | An integer parameter specifies a cut-off percent (3% by default). | |
163 | Directories contributing less than this percentage of the changes | |
164 | are not shown in the output. | |
165 | -- | |
166 | + | |
167 | Example: The following will count changed files, while ignoring | |
168 | directories with less than 10% of the total amount of changed files, | |
169 | and accumulating child directory counts in the parent directories: | |
170 | `--dirstat=files,10,cumulative`. | |
fd33777b | 171 | |
4bbd261b SE |
172 | --summary:: |
173 | Output a condensed summary of extended header information | |
174 | such as creations, renames and mode changes. | |
175 | ||
02bc5b03 | 176 | ifndef::git-format-patch[] |
29353273 | 177 | --patch-with-stat:: |
dce5ef14 | 178 | Synonym for `-p --stat`. |
02bc5b03 | 179 | endif::git-format-patch[] |
29353273 | 180 | |
d4cb003f | 181 | ifndef::git-format-patch[] |
64485b4a | 182 | |
dda2d79a | 183 | -z:: |
5c931c8d BG |
184 | ifdef::git-log[] |
185 | Separate the commits with NULs instead of with new newlines. | |
186 | + | |
187 | Also, when `--raw` or `--numstat` has been given, do not munge | |
188 | pathnames and use NULs as output field terminators. | |
189 | endif::git-log[] | |
64485b4a | 190 | ifndef::git-log[] |
03aa87ed CB |
191 | When `--raw`, `--numstat`, `--name-only` or `--name-status` has been |
192 | given, do not munge pathnames and use NULs as output field terminators. | |
5c931c8d | 193 | endif::git-log[] |
64485b4a BG |
194 | + |
195 | Without this option, each pathname output will have TAB, LF, double quotes, | |
196 | and backslash characters replaced with `\t`, `\n`, `\"`, and `\\`, | |
197 | respectively, and the pathname will be enclosed in double quotes if | |
198 | any of those replacements occurred. | |
dda2d79a JH |
199 | |
200 | --name-only:: | |
201 | Show only names of changed files. | |
202 | ||
946f5f7c | 203 | --name-status:: |
a6f47b2b MV |
204 | Show only names and status of changed files. See the description |
205 | of the `--diff-filter` option on what the status letters mean. | |
dda2d79a | 206 | |
752c0c24 | 207 | --submodule[=<format>]:: |
fd47ae6a JK |
208 | Specify how differences in submodules are shown. When specifying |
209 | `--submodule=short` the 'short' format is used. This format just | |
210 | shows the names of the commits at the beginning and end of the range. | |
211 | When `--submodule` or `--submodule=log` is specified, the 'log' | |
212 | format is used. This format lists the commits in the range like | |
213 | linkgit:git-submodule[1] `summary` does. When `--submodule=diff` | |
214 | is specified, the 'diff' format is used. This format shows an | |
215 | inline diff of the changes in the submodule contents between the | |
216 | commit range. Defaults to `diff.submodule` or the 'short' format | |
217 | if the config option is unset. | |
752c0c24 | 218 | |
73e9da01 | 219 | --color[=<when>]:: |
b5376648 | 220 | Show colored diff. |
3d0e75f2 JH |
221 | `--color` (i.e. without '=<when>') is the same as `--color=always`. |
222 | '<when>' can be one of `always`, `never`, or `auto`. | |
6999c540 MG |
223 | ifdef::git-diff[] |
224 | It can be changed by the `color.ui` and `color.diff` | |
225 | configuration settings. | |
226 | endif::git-diff[] | |
b5376648 JH |
227 | |
228 | --no-color:: | |
6999c540 MG |
229 | Turn off colored diff. |
230 | ifdef::git-diff[] | |
231 | This can be used to override configuration settings. | |
232 | endif::git-diff[] | |
233 | It is the same as `--color=never`. | |
b5376648 | 234 | |
882749a0 TR |
235 | --word-diff[=<mode>]:: |
236 | Show a word diff, using the <mode> to delimit changed words. | |
237 | By default, words are delimited by whitespace; see | |
238 | `--word-diff-regex` below. The <mode> defaults to 'plain', and | |
239 | must be one of: | |
240 | + | |
241 | -- | |
242 | color:: | |
243 | Highlight changed words using only colors. Implies `--color`. | |
244 | plain:: | |
245 | Show words as `[-removed-]` and `{+added+}`. Makes no | |
246 | attempts to escape the delimiters if they appear in the input, | |
247 | so the output may be ambiguous. | |
248 | porcelain:: | |
249 | Use a special line-based format intended for script | |
250 | consumption. Added/removed/unchanged runs are printed in the | |
251 | usual unified diff format, starting with a `+`/`-`/` ` | |
252 | character at the beginning of the line and extending to the | |
253 | end of the line. Newlines in the input are represented by a | |
254 | tilde `~` on a line of its own. | |
255 | none:: | |
256 | Disable word diff again. | |
257 | -- | |
258 | + | |
259 | Note that despite the name of the first mode, color is used to | |
260 | highlight the changed parts in all modes if enabled. | |
261 | ||
262 | --word-diff-regex=<regex>:: | |
263 | Use <regex> to decide what a word is, instead of considering | |
264 | runs of non-whitespace to be a word. Also implies | |
265 | `--word-diff` unless it was already enabled. | |
2b6a5417 | 266 | + |
882749a0 | 267 | Every non-overlapping match of the |
c4b252c3 TR |
268 | <regex> is considered a word. Anything between these matches is |
269 | considered whitespace and ignored(!) for the purposes of finding | |
270 | differences. You may want to append `|[^[:space:]]` to your regular | |
271 | expression to make sure that it matches all non-whitespace characters. | |
272 | A match that contains a newline is silently truncated(!) at the | |
273 | newline. | |
80c49c3d | 274 | + |
2c15c006 MG |
275 | For example, `--word-diff-regex=.` will treat each character as a word |
276 | and, correspondingly, show differences character by character. | |
277 | + | |
98a4d87b | 278 | The regex can also be set via a diff driver or configuration option, see |
1cca17df | 279 | linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly |
98a4d87b BSSJ |
280 | overrides any diff driver or configuration setting. Diff drivers |
281 | override configuration settings. | |
882749a0 TR |
282 | |
283 | --color-words[=<regex>]:: | |
284 | Equivalent to `--word-diff=color` plus (if a regex was | |
285 | specified) `--word-diff-regex=<regex>`. | |
d4cb003f | 286 | endif::git-format-patch[] |
f59a59e2 | 287 | |
b5376648 JH |
288 | --no-renames:: |
289 | Turn off rename detection, even when the configuration | |
290 | file gives the default to do so. | |
291 | ||
02bc5b03 | 292 | ifndef::git-format-patch[] |
16507fcf | 293 | --check:: |
30211fb6 OA |
294 | Warn if changes introduce conflict markers or whitespace errors. |
295 | What are considered whitespace errors is controlled by `core.whitespace` | |
4f830390 CK |
296 | configuration. By default, trailing whitespaces (including |
297 | lines that solely consist of whitespaces) and a space character | |
298 | that is immediately followed by a tab character inside the | |
299 | initial indent of the line are considered whitespace errors. | |
300 | Exits with non-zero status if problems are found. Not compatible | |
301 | with --exit-code. | |
b8767f79 JH |
302 | |
303 | --ws-error-highlight=<kind>:: | |
304 | Highlight whitespace errors on lines specified by <kind> | |
305 | in the color specified by `color.diff.whitespace`. <kind> | |
306 | is a comma separated list of `old`, `new`, `context`. When | |
307 | this option is not given, only whitespace errors in `new` | |
308 | lines are highlighted. E.g. `--ws-error-highlight=new,old` | |
309 | highlights whitespace errors on both deleted and added lines. | |
310 | `all` can be used as a short-hand for `old,new,context`. | |
a17505f2 JH |
311 | The `diff.wsErrorHighlight` configuration variable can be |
312 | used to specify the default behaviour. | |
b8767f79 | 313 | |
02bc5b03 | 314 | endif::git-format-patch[] |
16507fcf | 315 | |
80b1e511 | 316 | --full-index:: |
6457e58c JM |
317 | Instead of the first handful of characters, show the full |
318 | pre- and post-image blob object names on the "index" | |
319 | line when generating patch format output. | |
b5376648 JH |
320 | |
321 | --binary:: | |
dce5ef14 BG |
322 | In addition to `--full-index`, output a binary diff that |
323 | can be applied with `git-apply`. | |
80b1e511 | 324 | |
913419fc | 325 | --abbrev[=<n>]:: |
47dd0d59 JH |
326 | Instead of showing the full 40-byte hexadecimal object |
327 | name in diff-raw format output and diff-tree header | |
323b9db8 | 328 | lines, show only a partial prefix. This is |
dce5ef14 | 329 | independent of the `--full-index` option above, which controls |
913419fc | 330 | the diff-patch output format. Non default number of |
dce5ef14 | 331 | digits can be specified with `--abbrev=<n>`. |
47dd0d59 | 332 | |
cf958afd | 333 | -B[<n>][/<m>]:: |
37ab5156 | 334 | --break-rewrites[=[<n>][/<m>]]:: |
cf958afd MM |
335 | Break complete rewrite changes into pairs of delete and |
336 | create. This serves two purposes: | |
337 | + | |
338 | It affects the way a change that amounts to a total rewrite of a file | |
339 | not as a series of deletion and insertion mixed together with a very | |
340 | few lines that happen to match textually as the context, but as a | |
341 | single deletion of everything old followed by a single insertion of | |
342 | everything new, and the number `m` controls this aspect of the -B | |
343 | option (defaults to 60%). `-B/70%` specifies that less than 30% of the | |
2de9b711 | 344 | original should remain in the result for Git to consider it a total |
cf958afd MM |
345 | rewrite (i.e. otherwise the resulting patch will be a series of |
346 | deletion and insertion mixed together with context lines). | |
347 | + | |
348 | When used with -M, a totally-rewritten file is also considered as the | |
349 | source of a rename (usually -M only considers a file that disappeared | |
350 | as the source of a rename), and the number `n` controls this aspect of | |
351 | the -B option (defaults to 50%). `-B20%` specifies that a change with | |
352 | addition and deletion compared to 20% or more of the file's size are | |
353 | eligible for being picked up as a possible source of a rename to | |
354 | another file. | |
355 | ||
356 | -M[<n>]:: | |
f611ddc7 | 357 | --find-renames[=<n>]:: |
7ffad250 | 358 | ifndef::git-log[] |
dda2d79a | 359 | Detect renames. |
7ffad250 JK |
360 | endif::git-log[] |
361 | ifdef::git-log[] | |
362 | If generating diffs, detect and report renames for each commit. | |
363 | For following files across renames while traversing history, see | |
364 | `--follow`. | |
365 | endif::git-log[] | |
4c007ae8 | 366 | If `n` is specified, it is a threshold on the similarity |
cf958afd | 367 | index (i.e. amount of addition/deletions compared to the |
2de9b711 | 368 | file's size). For example, `-M90%` means Git should consider a |
cf958afd | 369 | delete/add pair to be a rename if more than 90% of the file |
31d66aa4 SC |
370 | hasn't changed. Without a `%` sign, the number is to be read as |
371 | a fraction, with a decimal point before it. I.e., `-M5` becomes | |
372 | 0.5, and is thus the same as `-M50%`. Similarly, `-M05` is | |
373 | the same as `-M5%`. To limit detection to exact renames, use | |
8240943b | 374 | `-M100%`. The default similarity index is 50%. |
dda2d79a | 375 | |
cf958afd | 376 | -C[<n>]:: |
f611ddc7 | 377 | --find-copies[=<n>]:: |
ca6c0970 | 378 | Detect copies as well as renames. See also `--find-copies-harder`. |
cf958afd | 379 | If `n` is specified, it has the same meaning as for `-M<n>`. |
dda2d79a JH |
380 | |
381 | --find-copies-harder:: | |
ca6c0970 | 382 | For performance reasons, by default, `-C` option finds copies only |
a6080a0a | 383 | if the original file of the copy was modified in the same |
f73ae1fc | 384 | changeset. This flag makes the command |
dda2d79a JH |
385 | inspect unmodified files as candidates for the source of |
386 | copy. This is a very expensive operation for large | |
ca6c0970 JS |
387 | projects, so use it with caution. Giving more than one |
388 | `-C` option has the same effect. | |
dda2d79a | 389 | |
467ddc14 JH |
390 | -D:: |
391 | --irreversible-delete:: | |
392 | Omit the preimage for deletes, i.e. print only the header but not | |
393 | the diff between the preimage and `/dev/null`. The resulting patch | |
a58088ab | 394 | is not meant to be applied with `patch` or `git apply`; this is |
467ddc14 JH |
395 | solely for people who want to just concentrate on reviewing the |
396 | text after the change. In addition, the output obviously lack | |
397 | enough information to apply such a patch in reverse, even manually, | |
398 | hence the name of the option. | |
399 | + | |
400 | When used together with `-B`, omit also the preimage in the deletion part | |
401 | of a delete/create pair. | |
402 | ||
8082d8d3 | 403 | -l<num>:: |
dce5ef14 | 404 | The `-M` and `-C` options require O(n^2) processing time where n |
f73ae1fc | 405 | is the number of potential rename/copy targets. This |
8082d8d3 | 406 | option prevents rename/copy detection from running if |
f73ae1fc | 407 | the number of rename/copy targets exceeds the specified |
8082d8d3 JH |
408 | number. |
409 | ||
d4cb003f | 410 | ifndef::git-format-patch[] |
f1037448 YD |
411 | --diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]:: |
412 | Select only files that are Added (`A`), Copied (`C`), | |
413 | Deleted (`D`), Modified (`M`), Renamed (`R`), have their | |
414 | type (i.e. regular file, symlink, submodule, ...) changed (`T`), | |
415 | are Unmerged (`U`), are | |
416 | Unknown (`X`), or have had their pairing Broken (`B`). | |
417 | Any combination of the filter characters (including none) can be used. | |
418 | When `*` (All-or-none) is added to the combination, all | |
419 | paths are selected if there is any file that matches | |
420 | other criteria in the comparison; if there is no file | |
421 | that matches other criteria, nothing is selected. | |
16726cfa JH |
422 | + |
423 | Also, these upper-case letters can be downcased to exclude. E.g. | |
424 | `--diff-filter=ad` excludes added and deleted paths. | |
f1037448 | 425 | |
dda2d79a | 426 | -S<string>:: |
5bc3f0b5 RR |
427 | Look for differences that change the number of occurrences of |
428 | the specified string (i.e. addition/deletion) in a file. | |
429 | Intended for the scripter's use. | |
430 | + | |
431 | It is useful when you're looking for an exact block of code (like a | |
432 | struct), and want to know the history of that block since it first | |
433 | came into being: use the feature iteratively to feed the interesting | |
434 | block in the preimage back into `-S`, and keep going until you get the | |
435 | very first version of the block. | |
dda2d79a | 436 | |
f506b8e8 | 437 | -G<regex>:: |
5bc3f0b5 RR |
438 | Look for differences whose patch text contains added/removed |
439 | lines that match <regex>. | |
440 | + | |
441 | To illustrate the difference between `-S<regex> --pickaxe-regex` and | |
442 | `-G<regex>`, consider a commit with the following diff in the same | |
443 | file: | |
444 | + | |
445 | ---- | |
446 | + return !regexec(regexp, two->ptr, 1, ®match, 0); | |
447 | ... | |
448 | - hit = !regexec(regexp, mf2.ptr, 1, ®match, 0); | |
449 | ---- | |
450 | + | |
451 | While `git log -G"regexec\(regexp"` will show this commit, `git log | |
452 | -S"regexec\(regexp" --pickaxe-regex` will not (because the number of | |
453 | occurrences of that string did not change). | |
454 | + | |
455 | See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more | |
456 | information. | |
f506b8e8 | 457 | |
dda2d79a | 458 | --pickaxe-all:: |
f506b8e8 | 459 | When `-S` or `-G` finds a change, show all the changes in that |
f73ae1fc | 460 | changeset, not just the files that contain the change |
dda2d79a JH |
461 | in <string>. |
462 | ||
d01d8c67 | 463 | --pickaxe-regex:: |
5bc3f0b5 RR |
464 | Treat the <string> given to `-S` as an extended POSIX regular |
465 | expression to match. | |
d4cb003f | 466 | endif::git-format-patch[] |
d01d8c67 | 467 | |
dda2d79a | 468 | -O<orderfile>:: |
874444b7 | 469 | Control the order in which files appear in the output. |
da0005b8 NTND |
470 | This overrides the `diff.orderFile` configuration variable |
471 | (see linkgit:git-config[1]). To cancel `diff.orderFile`, | |
6d8940b5 | 472 | use `-O/dev/null`. |
874444b7 RH |
473 | + |
474 | The output order is determined by the order of glob patterns in | |
475 | <orderfile>. | |
476 | All files with pathnames that match the first pattern are output | |
477 | first, all files with pathnames that match the second pattern (but not | |
478 | the first) are output next, and so on. | |
479 | All files with pathnames that do not match any pattern are output | |
480 | last, as if there was an implicit match-all pattern at the end of the | |
481 | file. | |
482 | If multiple pathnames have the same rank (they match the same pattern | |
483 | but no earlier patterns), their output order relative to each other is | |
484 | the normal order. | |
485 | + | |
486 | <orderfile> is parsed as follows: | |
487 | + | |
488 | -- | |
489 | - Blank lines are ignored, so they can be used as separators for | |
490 | readability. | |
491 | ||
492 | - Lines starting with a hash ("`#`") are ignored, so they can be used | |
493 | for comments. Add a backslash ("`\`") to the beginning of the | |
494 | pattern if it starts with a hash. | |
495 | ||
496 | - Each other line contains a single pattern. | |
497 | -- | |
498 | + | |
499 | Patterns have the same syntax and semantics as patterns used for | |
500 | fnmantch(3) without the FNM_PATHNAME flag, except a pathname also | |
501 | matches a pattern if removing any number of the final pathname | |
502 | components matches the pattern. For example, the pattern "`foo*bar`" | |
503 | matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`". | |
dda2d79a | 504 | |
d4cb003f | 505 | ifndef::git-format-patch[] |
dda2d79a | 506 | -R:: |
5f3aa197 | 507 | Swap two inputs; that is, show differences from index or |
dda2d79a JH |
508 | on-disk file to tree contents. |
509 | ||
c0cb4a06 | 510 | --relative[=<path>]:: |
cd676a51 JH |
511 | When run from a subdirectory of the project, it can be |
512 | told to exclude changes outside the directory and show | |
c0cb4a06 JH |
513 | pathnames relative to it with this option. When you are |
514 | not in a subdirectory (e.g. in a bare repository), you | |
515 | can name which subdirectory to make the output relative | |
516 | to by giving a <path> as an argument. | |
d4cb003f | 517 | endif::git-format-patch[] |
cd676a51 | 518 | |
a9e67c8c | 519 | -a:: |
d507bb15 SF |
520 | --text:: |
521 | Treat all files as text. | |
522 | ||
a44a0c99 | 523 | --ignore-space-at-eol:: |
0ac7903e | 524 | Ignore changes in whitespace at EOL. |
a44a0c99 | 525 | |
a9e67c8c | 526 | -b:: |
8ebe185b | 527 | --ignore-space-change:: |
0ac7903e WC |
528 | Ignore changes in amount of whitespace. This ignores whitespace |
529 | at line end, and considers all other sequences of one or | |
530 | more whitespace characters to be equivalent. | |
8ebe185b | 531 | |
a9e67c8c | 532 | -w:: |
8ebe185b | 533 | --ignore-all-space:: |
0ac7903e WC |
534 | Ignore whitespace when comparing lines. This ignores |
535 | differences even if one line has whitespace where the other | |
8ebe185b JN |
536 | line has none. |
537 | ||
36617af7 AP |
538 | --ignore-blank-lines:: |
539 | Ignore changes whose lines are all blank. | |
540 | ||
6d0e674a RS |
541 | --inter-hunk-context=<lines>:: |
542 | Show the context between diff hunks, up to the specified number | |
543 | of lines, thereby fusing hunks that are close to each other. | |
544 | ||
14937c2c RS |
545 | -W:: |
546 | --function-context:: | |
547 | Show whole surrounding functions of changes. | |
548 | ||
d4cb003f | 549 | ifndef::git-format-patch[] |
939ca96b | 550 | ifndef::git-log[] |
41bbf9d5 AR |
551 | --exit-code:: |
552 | Make the program exit with codes similar to diff(1). | |
553 | That is, it exits with 1 if there were differences and | |
554 | 0 means no differences. | |
555 | ||
2a18c266 | 556 | --quiet:: |
dce5ef14 | 557 | Disable all output of the program. Implies `--exit-code`. |
939ca96b | 558 | endif::git-log[] |
d4cb003f | 559 | endif::git-format-patch[] |
2a18c266 | 560 | |
72909bef JS |
561 | --ext-diff:: |
562 | Allow an external diff helper to be executed. If you set an | |
5162e697 DM |
563 | external diff driver with linkgit:gitattributes[5], you need |
564 | to use this option with linkgit:git-log[1] and friends. | |
72909bef JS |
565 | |
566 | --no-ext-diff:: | |
567 | Disallow external diff drivers. | |
568 | ||
d28790dc JK |
569 | --textconv:: |
570 | --no-textconv:: | |
571 | Allow (or disallow) external text conversion filters to be run | |
572 | when comparing binary files. See linkgit:gitattributes[5] for | |
573 | details. Because textconv filters are typically a one-way | |
574 | conversion, the resulting diff is suitable for human | |
575 | consumption, but cannot be applied. For this reason, textconv | |
576 | filters are enabled by default only for linkgit:git-diff[1] and | |
577 | linkgit:git-log[1], but not for linkgit:git-format-patch[1] or | |
578 | diff plumbing commands. | |
579 | ||
dd44d419 JL |
580 | --ignore-submodules[=<when>]:: |
581 | Ignore changes to submodules in the diff generation. <when> can be | |
b1d04bfc | 582 | either "none", "untracked", "dirty" or "all", which is the default. |
aee9c7d6 JL |
583 | Using "none" will consider the submodule modified when it either contains |
584 | untracked or modified files or its HEAD differs from the commit recorded | |
585 | in the superproject and can be used to override any settings of the | |
302ad7a9 | 586 | 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When |
dd44d419 JL |
587 | "untracked" is used submodules are not considered dirty when they only |
588 | contain untracked content (but they are still scanned for modified | |
589 | content). Using "dirty" ignores all changes to the work tree of submodules, | |
590 | only changes to the commits stored in the superproject are shown (this was | |
591 | the behavior until 1.7.0). Using "all" hides all changes to submodules. | |
50fd9bd8 | 592 | |
eab9a40b JS |
593 | --src-prefix=<prefix>:: |
594 | Show the given source prefix instead of "a/". | |
595 | ||
596 | --dst-prefix=<prefix>:: | |
597 | Show the given destination prefix instead of "b/". | |
598 | ||
599 | --no-prefix:: | |
600 | Do not show any source or destination prefix. | |
601 | ||
660e113c JK |
602 | --line-prefix=<prefix>:: |
603 | Prepend an additional prefix to every line of output. | |
604 | ||
b42b4519 NTND |
605 | --ita-invisible-in-index:: |
606 | By default entries added by "git add -N" appear as an existing | |
607 | empty file in "git diff" and a new file in "git diff --cached". | |
608 | This option makes the entry appear as a new file in "git diff" | |
609 | and non-existent in "git diff --cached". This option could be | |
610 | reverted with `--ita-visible-in-index`. Both options are | |
611 | experimental and could be removed in future. | |
612 | ||
8db9307c | 613 | For more detailed explanation on these common options, see also |
6998e4db | 614 | linkgit:gitdiffcore[7]. |