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[] 9ifndef::git-log[] 10:git-diff-core: 1 11endif::git-log[] 12endif::git-diff[] 13endif::git-format-patch[] 14 15ifdef::git-format-patch[] 16-p:: 17--no-stat:: 18 Generate plain patches without any diffstats. 19endif::git-format-patch[] 20 21ifndef::git-format-patch[] 22-p:: 23-u:: 24--patch:: 25 Generate patch (see section on generating patches). 26ifdef::git-diff[] 27 This is the default. 28endif::git-diff[] 29 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`. 34endif::git-format-patch[] 35 36-U<n>:: 37--unified=<n>:: 38 Generate diffs with <n> lines of context instead of 39 the usual three. 40ifndef::git-format-patch[] 41 Implies `-p`. 42endif::git-format-patch[] 43 44ifndef::git-format-patch[] 45--raw:: 46ifndef::git-log[] 47 Generate the diff in raw format. 48ifdef::git-diff-core[] 49 This is the default. 50endif::git-diff-core[] 51endif::git-log[] 52ifdef::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`. 58endif::git-log[] 59endif::git-format-patch[] 60 61ifndef::git-format-patch[] 62--patch-with-raw:: 63 Synonym for `-p --raw`. 64endif::git-format-patch[] 65 66--indent-heuristic:: 67 Enable the heuristic that shift diff hunk boundaries to make patches 68 easier to read. This is the default. 69 70--no-indent-heuristic:: 71 Disable the indent heuristic. 72 73--minimal:: 74 Spend extra time to make sure the smallest possible 75 diff is produced. 76 77--patience:: 78 Generate a diff using the "patience diff" algorithm. 79 80--histogram:: 81 Generate a diff using the "histogram diff" algorithm. 82 83--anchored=<text>:: 84 Generate a diff using the "anchored diff" algorithm. 85+ 86This option may be specified more than once. 87+ 88If a line exists in both the source and destination, exists only once, 89and starts with this text, this algorithm attempts to prevent it from 90appearing as a deletion or addition in the output. It uses the "patience 91diff" algorithm internally. 92 93--diff-algorithm={patience|minimal|histogram|myers}:: 94 Choose a diff algorithm. The variants are as follows: 95+ 96-- 97`default`, `myers`;; 98 The basic greedy diff algorithm. Currently, this is the default. 99`minimal`;; 100 Spend extra time to make sure the smallest possible diff is 101 produced. 102`patience`;; 103 Use "patience diff" algorithm when generating patches. 104`histogram`;; 105 This algorithm extends the patience algorithm to "support 106 low-occurrence common elements". 107-- 108+ 109For instance, if you configured diff.algorithm variable to a 110non-default value and want to use the default one, then you 111have to use `--diff-algorithm=default` option. 112 113--stat[=<width>[,<name-width>[,<count>]]]:: 114 Generate a diffstat. By default, as much space as necessary 115 will be used for the filename part, and the rest for the graph 116 part. Maximum width defaults to terminal width, or 80 columns 117 if not connected to a terminal, and can be overridden by 118 `<width>`. The width of the filename part can be limited by 119 giving another width `<name-width>` after a comma. The width 120 of the graph part can be limited by using 121 `--stat-graph-width=<width>` (affects all commands generating 122 a stat graph) or by setting `diff.statGraphWidth=<width>` 123 (does not affect `git format-patch`). 124 By giving a third parameter `<count>`, you can limit the 125 output to the first `<count>` lines, followed by `...` if 126 there are more. 127+ 128These parameters can also be set individually with `--stat-width=<width>`, 129`--stat-name-width=<name-width>` and `--stat-count=<count>`. 130 131--compact-summary:: 132 Output a condensed summary of extended header information such 133 as file creations or deletions ("new" or "gone", optionally "+l" 134 if it's a symlink) and mode changes ("+x" or "-x" for adding 135 or removing executable bit respectively) in diffstat. The 136 information is put betwen the filename part and the graph 137 part. Implies `--stat`. 138 139--numstat:: 140 Similar to `--stat`, but shows number of added and 141 deleted lines in decimal notation and pathname without 142 abbreviation, to make it more machine friendly. For 143 binary files, outputs two `-` instead of saying 144 `0 0`. 145 146--shortstat:: 147 Output only the last line of the `--stat` format containing total 148 number of modified files, as well as number of added and deleted 149 lines. 150 151--dirstat[=<param1,param2,...>]:: 152 Output the distribution of relative amount of changes for each 153 sub-directory. The behavior of `--dirstat` can be customized by 154 passing it a comma separated list of parameters. 155 The defaults are controlled by the `diff.dirstat` configuration 156 variable (see linkgit:git-config[1]). 157 The following parameters are available: 158+ 159-- 160`changes`;; 161 Compute the dirstat numbers by counting the lines that have been 162 removed from the source, or added to the destination. This ignores 163 the amount of pure code movements within a file. In other words, 164 rearranging lines in a file is not counted as much as other changes. 165 This is the default behavior when no parameter is given. 166`lines`;; 167 Compute the dirstat numbers by doing the regular line-based diff 168 analysis, and summing the removed/added line counts. (For binary 169 files, count 64-byte chunks instead, since binary files have no 170 natural concept of lines). This is a more expensive `--dirstat` 171 behavior than the `changes` behavior, but it does count rearranged 172 lines within a file as much as other changes. The resulting output 173 is consistent with what you get from the other `--*stat` options. 174`files`;; 175 Compute the dirstat numbers by counting the number of files changed. 176 Each changed file counts equally in the dirstat analysis. This is 177 the computationally cheapest `--dirstat` behavior, since it does 178 not have to look at the file contents at all. 179`cumulative`;; 180 Count changes in a child directory for the parent directory as well. 181 Note that when using `cumulative`, the sum of the percentages 182 reported may exceed 100%. The default (non-cumulative) behavior can 183 be specified with the `noncumulative` parameter. 184<limit>;; 185 An integer parameter specifies a cut-off percent (3% by default). 186 Directories contributing less than this percentage of the changes 187 are not shown in the output. 188-- 189+ 190Example: The following will count changed files, while ignoring 191directories with less than 10% of the total amount of changed files, 192and accumulating child directory counts in the parent directories: 193`--dirstat=files,10,cumulative`. 194 195--summary:: 196 Output a condensed summary of extended header information 197 such as creations, renames and mode changes. 198 199ifndef::git-format-patch[] 200--patch-with-stat:: 201 Synonym for `-p --stat`. 202endif::git-format-patch[] 203 204ifndef::git-format-patch[] 205 206-z:: 207ifdef::git-log[] 208 Separate the commits with NULs instead of with new newlines. 209+ 210Also, when `--raw` or `--numstat` has been given, do not munge 211pathnames and use NULs as output field terminators. 212endif::git-log[] 213ifndef::git-log[] 214 When `--raw`, `--numstat`, `--name-only` or `--name-status` has been 215 given, do not munge pathnames and use NULs as output field terminators. 216endif::git-log[] 217+ 218Without this option, pathnames with "unusual" characters are quoted as 219explained for the configuration variable `core.quotePath` (see 220linkgit:git-config[1]). 221 222--name-only:: 223 Show only names of changed files. 224 225--name-status:: 226 Show only names and status of changed files. See the description 227 of the `--diff-filter` option on what the status letters mean. 228 229--submodule[=<format>]:: 230 Specify how differences in submodules are shown. When specifying 231 `--submodule=short` the 'short' format is used. This format just 232 shows the names of the commits at the beginning and end of the range. 233 When `--submodule` or `--submodule=log` is specified, the 'log' 234 format is used. This format lists the commits in the range like 235 linkgit:git-submodule[1] `summary` does. When `--submodule=diff` 236 is specified, the 'diff' format is used. This format shows an 237 inline diff of the changes in the submodule contents between the 238 commit range. Defaults to `diff.submodule` or the 'short' format 239 if the config option is unset. 240 241--color[=<when>]:: 242 Show colored diff. 243 `--color` (i.e. without '=<when>') is the same as `--color=always`. 244 '<when>' can be one of `always`, `never`, or `auto`. 245ifdef::git-diff[] 246 It can be changed by the `color.ui` and `color.diff` 247 configuration settings. 248endif::git-diff[] 249 250--no-color:: 251 Turn off colored diff. 252ifdef::git-diff[] 253 This can be used to override configuration settings. 254endif::git-diff[] 255 It is the same as `--color=never`. 256 257--color-moved[=<mode>]:: 258 Moved lines of code are colored differently. 259ifdef::git-diff[] 260 It can be changed by the `diff.colorMoved` configuration setting. 261endif::git-diff[] 262 The <mode> defaults to 'no' if the option is not given 263 and to 'zebra' if the option with no mode is given. 264 The mode must be one of: 265+ 266-- 267no:: 268 Moved lines are not highlighted. 269default:: 270 Is a synonym for `zebra`. This may change to a more sensible mode 271 in the future. 272plain:: 273 Any line that is added in one location and was removed 274 in another location will be colored with 'color.diff.newMoved'. 275 Similarly 'color.diff.oldMoved' will be used for removed lines 276 that are added somewhere else in the diff. This mode picks up any 277 moved line, but it is not very useful in a review to determine 278 if a block of code was moved without permutation. 279blocks:: 280 Blocks of moved text of at least 20 alphanumeric characters 281 are detected greedily. The detected blocks are 282 painted using either the 'color.diff.{old,new}Moved' color. 283 Adjacent blocks cannot be told apart. 284zebra:: 285 Blocks of moved text are detected as in 'blocks' mode. The blocks 286 are painted using either the 'color.diff.{old,new}Moved' color or 287 'color.diff.{old,new}MovedAlternative'. The change between 288 the two colors indicates that a new block was detected. 289dimmed_zebra:: 290 Similar to 'zebra', but additional dimming of uninteresting parts 291 of moved code is performed. The bordering lines of two adjacent 292 blocks are considered interesting, the rest is uninteresting. 293-- 294 295--color-moved-ws=<modes>:: 296 This configures how white spaces are ignored when performing the 297 move detection for `--color-moved`. These modes can be given 298 as a comma separated list: 299+ 300-- 301ignore-space-at-eol:: 302 Ignore changes in whitespace at EOL. 303ignore-space-change:: 304 Ignore changes in amount of whitespace. This ignores whitespace 305 at line end, and considers all other sequences of one or 306 more whitespace characters to be equivalent. 307ignore-all-space:: 308 Ignore whitespace when comparing lines. This ignores differences 309 even if one line has whitespace where the other line has none. 310-- 311 312--word-diff[=<mode>]:: 313 Show a word diff, using the <mode> to delimit changed words. 314 By default, words are delimited by whitespace; see 315 `--word-diff-regex` below. The <mode> defaults to 'plain', and 316 must be one of: 317+ 318-- 319color:: 320 Highlight changed words using only colors. Implies `--color`. 321plain:: 322 Show words as `[-removed-]` and `{+added+}`. Makes no 323 attempts to escape the delimiters if they appear in the input, 324 so the output may be ambiguous. 325porcelain:: 326 Use a special line-based format intended for script 327 consumption. Added/removed/unchanged runs are printed in the 328 usual unified diff format, starting with a `+`/`-`/` ` 329 character at the beginning of the line and extending to the 330 end of the line. Newlines in the input are represented by a 331 tilde `~` on a line of its own. 332none:: 333 Disable word diff again. 334-- 335+ 336Note that despite the name of the first mode, color is used to 337highlight the changed parts in all modes if enabled. 338 339--word-diff-regex=<regex>:: 340 Use <regex> to decide what a word is, instead of considering 341 runs of non-whitespace to be a word. Also implies 342 `--word-diff` unless it was already enabled. 343+ 344Every non-overlapping match of the 345<regex> is considered a word. Anything between these matches is 346considered whitespace and ignored(!) for the purposes of finding 347differences. You may want to append `|[^[:space:]]` to your regular 348expression to make sure that it matches all non-whitespace characters. 349A match that contains a newline is silently truncated(!) at the 350newline. 351+ 352For example, `--word-diff-regex=.` will treat each character as a word 353and, correspondingly, show differences character by character. 354+ 355The regex can also be set via a diff driver or configuration option, see 356linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly 357overrides any diff driver or configuration setting. Diff drivers 358override configuration settings. 359 360--color-words[=<regex>]:: 361 Equivalent to `--word-diff=color` plus (if a regex was 362 specified) `--word-diff-regex=<regex>`. 363endif::git-format-patch[] 364 365--no-renames:: 366 Turn off rename detection, even when the configuration 367 file gives the default to do so. 368 369ifndef::git-format-patch[] 370--check:: 371 Warn if changes introduce conflict markers or whitespace errors. 372 What are considered whitespace errors is controlled by `core.whitespace` 373 configuration. By default, trailing whitespaces (including 374 lines that solely consist of whitespaces) and a space character 375 that is immediately followed by a tab character inside the 376 initial indent of the line are considered whitespace errors. 377 Exits with non-zero status if problems are found. Not compatible 378 with --exit-code. 379 380--ws-error-highlight=<kind>:: 381 Highlight whitespace errors in the `context`, `old` or `new` 382 lines of the diff. Multiple values are separated by comma, 383 `none` resets previous values, `default` reset the list to 384 `new` and `all` is a shorthand for `old,new,context`. When 385 this option is not given, and the configuration variable 386 `diff.wsErrorHighlight` is not set, only whitespace errors in 387 `new` lines are highlighted. The whitespace errors are colored 388 whith `color.diff.whitespace`. 389 390endif::git-format-patch[] 391 392--full-index:: 393 Instead of the first handful of characters, show the full 394 pre- and post-image blob object names on the "index" 395 line when generating patch format output. 396 397--binary:: 398 In addition to `--full-index`, output a binary diff that 399 can be applied with `git-apply`. 400 401--abbrev[=<n>]:: 402 Instead of showing the full 40-byte hexadecimal object 403 name in diff-raw format output and diff-tree header 404 lines, show only a partial prefix. This is 405 independent of the `--full-index` option above, which controls 406 the diff-patch output format. Non default number of 407 digits can be specified with `--abbrev=<n>`. 408 409-B[<n>][/<m>]:: 410--break-rewrites[=[<n>][/<m>]]:: 411 Break complete rewrite changes into pairs of delete and 412 create. This serves two purposes: 413+ 414It affects the way a change that amounts to a total rewrite of a file 415not as a series of deletion and insertion mixed together with a very 416few lines that happen to match textually as the context, but as a 417single deletion of everything old followed by a single insertion of 418everything new, and the number `m` controls this aspect of the -B 419option (defaults to 60%). `-B/70%` specifies that less than 30% of the 420original should remain in the result for Git to consider it a total 421rewrite (i.e. otherwise the resulting patch will be a series of 422deletion and insertion mixed together with context lines). 423+ 424When used with -M, a totally-rewritten file is also considered as the 425source of a rename (usually -M only considers a file that disappeared 426as the source of a rename), and the number `n` controls this aspect of 427the -B option (defaults to 50%). `-B20%` specifies that a change with 428addition and deletion compared to 20% or more of the file's size are 429eligible for being picked up as a possible source of a rename to 430another file. 431 432-M[<n>]:: 433--find-renames[=<n>]:: 434ifndef::git-log[] 435 Detect renames. 436endif::git-log[] 437ifdef::git-log[] 438 If generating diffs, detect and report renames for each commit. 439 For following files across renames while traversing history, see 440 `--follow`. 441endif::git-log[] 442 If `n` is specified, it is a threshold on the similarity 443 index (i.e. amount of addition/deletions compared to the 444 file's size). For example, `-M90%` means Git should consider a 445 delete/add pair to be a rename if more than 90% of the file 446 hasn't changed. Without a `%` sign, the number is to be read as 447 a fraction, with a decimal point before it. I.e., `-M5` becomes 448 0.5, and is thus the same as `-M50%`. Similarly, `-M05` is 449 the same as `-M5%`. To limit detection to exact renames, use 450 `-M100%`. The default similarity index is 50%. 451 452-C[<n>]:: 453--find-copies[=<n>]:: 454 Detect copies as well as renames. See also `--find-copies-harder`. 455 If `n` is specified, it has the same meaning as for `-M<n>`. 456 457--find-copies-harder:: 458 For performance reasons, by default, `-C` option finds copies only 459 if the original file of the copy was modified in the same 460 changeset. This flag makes the command 461 inspect unmodified files as candidates for the source of 462 copy. This is a very expensive operation for large 463 projects, so use it with caution. Giving more than one 464 `-C` option has the same effect. 465 466-D:: 467--irreversible-delete:: 468 Omit the preimage for deletes, i.e. print only the header but not 469 the diff between the preimage and `/dev/null`. The resulting patch 470 is not meant to be applied with `patch` or `git apply`; this is 471 solely for people who want to just concentrate on reviewing the 472 text after the change. In addition, the output obviously lacks 473 enough information to apply such a patch in reverse, even manually, 474 hence the name of the option. 475+ 476When used together with `-B`, omit also the preimage in the deletion part 477of a delete/create pair. 478 479-l<num>:: 480 The `-M` and `-C` options require O(n^2) processing time where n 481 is the number of potential rename/copy targets. This 482 option prevents rename/copy detection from running if 483 the number of rename/copy targets exceeds the specified 484 number. 485 486ifndef::git-format-patch[] 487--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]:: 488 Select only files that are Added (`A`), Copied (`C`), 489 Deleted (`D`), Modified (`M`), Renamed (`R`), have their 490 type (i.e. regular file, symlink, submodule, ...) changed (`T`), 491 are Unmerged (`U`), are 492 Unknown (`X`), or have had their pairing Broken (`B`). 493 Any combination of the filter characters (including none) can be used. 494 When `*` (All-or-none) is added to the combination, all 495 paths are selected if there is any file that matches 496 other criteria in the comparison; if there is no file 497 that matches other criteria, nothing is selected. 498+ 499Also, these upper-case letters can be downcased to exclude. E.g. 500`--diff-filter=ad` excludes added and deleted paths. 501+ 502Note that not all diffs can feature all types. For instance, diffs 503from the index to the working tree can never have Added entries 504(because the set of paths included in the diff is limited by what is in 505the index). Similarly, copied and renamed entries cannot appear if 506detection for those types is disabled. 507 508-S<string>:: 509 Look for differences that change the number of occurrences of 510 the specified string (i.e. addition/deletion) in a file. 511 Intended for the scripter's use. 512+ 513It is useful when you're looking for an exact block of code (like a 514struct), and want to know the history of that block since it first 515came into being: use the feature iteratively to feed the interesting 516block in the preimage back into `-S`, and keep going until you get the 517very first version of the block. 518 519-G<regex>:: 520 Look for differences whose patch text contains added/removed 521 lines that match <regex>. 522+ 523To illustrate the difference between `-S<regex> --pickaxe-regex` and 524`-G<regex>`, consider a commit with the following diff in the same 525file: 526+ 527---- 528+ return !regexec(regexp, two->ptr, 1, ®match, 0); 529... 530- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0); 531---- 532+ 533While `git log -G"regexec\(regexp"` will show this commit, `git log 534-S"regexec\(regexp" --pickaxe-regex` will not (because the number of 535occurrences of that string did not change). 536+ 537See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more 538information. 539 540--find-object=<object-id>:: 541 Look for differences that change the number of occurrences of 542 the specified object. Similar to `-S`, just the argument is different 543 in that it doesn't search for a specific string but for a specific 544 object id. 545+ 546The object can be a blob or a submodule commit. It implies the `-t` option in 547`git-log` to also find trees. 548 549--pickaxe-all:: 550 When `-S` or `-G` finds a change, show all the changes in that 551 changeset, not just the files that contain the change 552 in <string>. 553 554--pickaxe-regex:: 555 Treat the <string> given to `-S` as an extended POSIX regular 556 expression to match. 557 558endif::git-format-patch[] 559 560-O<orderfile>:: 561 Control the order in which files appear in the output. 562 This overrides the `diff.orderFile` configuration variable 563 (see linkgit:git-config[1]). To cancel `diff.orderFile`, 564 use `-O/dev/null`. 565+ 566The output order is determined by the order of glob patterns in 567<orderfile>. 568All files with pathnames that match the first pattern are output 569first, all files with pathnames that match the second pattern (but not 570the first) are output next, and so on. 571All files with pathnames that do not match any pattern are output 572last, as if there was an implicit match-all pattern at the end of the 573file. 574If multiple pathnames have the same rank (they match the same pattern 575but no earlier patterns), their output order relative to each other is 576the normal order. 577+ 578<orderfile> is parsed as follows: 579+ 580-- 581 - Blank lines are ignored, so they can be used as separators for 582 readability. 583 584 - Lines starting with a hash ("`#`") are ignored, so they can be used 585 for comments. Add a backslash ("`\`") to the beginning of the 586 pattern if it starts with a hash. 587 588 - Each other line contains a single pattern. 589-- 590+ 591Patterns have the same syntax and semantics as patterns used for 592fnmantch(3) without the FNM_PATHNAME flag, except a pathname also 593matches a pattern if removing any number of the final pathname 594components matches the pattern. For example, the pattern "`foo*bar`" 595matches "`fooasdfbar`" and "`foo/bar/baz/asdf`" but not "`foobarx`". 596 597ifndef::git-format-patch[] 598-R:: 599 Swap two inputs; that is, show differences from index or 600 on-disk file to tree contents. 601 602--relative[=<path>]:: 603 When run from a subdirectory of the project, it can be 604 told to exclude changes outside the directory and show 605 pathnames relative to it with this option. When you are 606 not in a subdirectory (e.g. in a bare repository), you 607 can name which subdirectory to make the output relative 608 to by giving a <path> as an argument. 609endif::git-format-patch[] 610 611-a:: 612--text:: 613 Treat all files as text. 614 615--ignore-cr-at-eol:: 616 Ignore carrige-return at the end of line when doing a comparison. 617 618--ignore-space-at-eol:: 619 Ignore changes in whitespace at EOL. 620 621-b:: 622--ignore-space-change:: 623 Ignore changes in amount of whitespace. This ignores whitespace 624 at line end, and considers all other sequences of one or 625 more whitespace characters to be equivalent. 626 627-w:: 628--ignore-all-space:: 629 Ignore whitespace when comparing lines. This ignores 630 differences even if one line has whitespace where the other 631 line has none. 632 633--ignore-blank-lines:: 634 Ignore changes whose lines are all blank. 635 636--inter-hunk-context=<lines>:: 637 Show the context between diff hunks, up to the specified number 638 of lines, thereby fusing hunks that are close to each other. 639 Defaults to `diff.interHunkContext` or 0 if the config option 640 is unset. 641 642-W:: 643--function-context:: 644 Show whole surrounding functions of changes. 645 646ifndef::git-format-patch[] 647ifndef::git-log[] 648--exit-code:: 649 Make the program exit with codes similar to diff(1). 650 That is, it exits with 1 if there were differences and 651 0 means no differences. 652 653--quiet:: 654 Disable all output of the program. Implies `--exit-code`. 655endif::git-log[] 656endif::git-format-patch[] 657 658--ext-diff:: 659 Allow an external diff helper to be executed. If you set an 660 external diff driver with linkgit:gitattributes[5], you need 661 to use this option with linkgit:git-log[1] and friends. 662 663--no-ext-diff:: 664 Disallow external diff drivers. 665 666--textconv:: 667--no-textconv:: 668 Allow (or disallow) external text conversion filters to be run 669 when comparing binary files. See linkgit:gitattributes[5] for 670 details. Because textconv filters are typically a one-way 671 conversion, the resulting diff is suitable for human 672 consumption, but cannot be applied. For this reason, textconv 673 filters are enabled by default only for linkgit:git-diff[1] and 674 linkgit:git-log[1], but not for linkgit:git-format-patch[1] or 675 diff plumbing commands. 676 677--ignore-submodules[=<when>]:: 678 Ignore changes to submodules in the diff generation. <when> can be 679 either "none", "untracked", "dirty" or "all", which is the default. 680 Using "none" will consider the submodule modified when it either contains 681 untracked or modified files or its HEAD differs from the commit recorded 682 in the superproject and can be used to override any settings of the 683 'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When 684 "untracked" is used submodules are not considered dirty when they only 685 contain untracked content (but they are still scanned for modified 686 content). Using "dirty" ignores all changes to the work tree of submodules, 687 only changes to the commits stored in the superproject are shown (this was 688 the behavior until 1.7.0). Using "all" hides all changes to submodules. 689 690--src-prefix=<prefix>:: 691 Show the given source prefix instead of "a/". 692 693--dst-prefix=<prefix>:: 694 Show the given destination prefix instead of "b/". 695 696--no-prefix:: 697 Do not show any source or destination prefix. 698 699--line-prefix=<prefix>:: 700 Prepend an additional prefix to every line of output. 701 702--ita-invisible-in-index:: 703 By default entries added by "git add -N" appear as an existing 704 empty file in "git diff" and a new file in "git diff --cached". 705 This option makes the entry appear as a new file in "git diff" 706 and non-existent in "git diff --cached". This option could be 707 reverted with `--ita-visible-in-index`. Both options are 708 experimental and could be removed in future. 709 710For more detailed explanation on these common options, see also 711linkgit:gitdiffcore[7].