Newer
Older
#. type: Plain text
#: en/diff-options.txt:215
msgid "Output a condensed summary of extended header information such as creations, renames and mode changes."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:217
#, ignore-same, no-wrap, priority:280
msgid "--patch-with-stat"
#. type: Plain text
#: en/diff-options.txt:219
msgid "Synonym for `-p --stat`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:223 en/git-apply.txt:115 en/git-check-attr.txt:34 en/git-check-ignore.txt:47 en/git-checkout-index.txt:67 en/git-commit.txt:123 en/git-config.txt:206 en/git-grep.txt:207 en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23 en/git-status.txt:126 en/git-update-index.txt:174
#, ignore-same, no-wrap, priority:280
#. type: Plain text
#: en/diff-options.txt:226
#, no-wrap, priority:280
msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:229
msgid "Also, when `--raw` or `--numstat` has been given, do not munge pathnames and use NULs as output field terminators."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:233
#, no-wrap, priority:280
msgid ""
"\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n"
"\tgiven, do not munge pathnames and use NULs as output field terminators.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:238 en/git-apply.txt:122
msgid "Without this option, pathnames with \"unusual\" characters are quoted as explained for the configuration variable `core.quotePath` (see linkgit:git-config[1])."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:239 en/git-config.txt:215 en/git-grep.txt:189 en/git-ls-tree.txt:59 en/git-name-rev.txt:51
#, ignore-same, no-wrap, priority:280
msgid "--name-only"
#. type: Plain text
#: en/diff-options.txt:241
msgid "Show only names of changed files."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:242 en/git-ls-tree.txt:60
#, ignore-same, no-wrap, priority:280
msgid "--name-status"
#. type: Plain text
#: en/diff-options.txt:245
msgid "Show only names and status of changed files. See the description of the `--diff-filter` option on what the status letters mean."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:246
#, no-wrap, priority:280
msgid "--submodule[=<format>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:257
msgid "Specify how differences in submodules are shown. When specifying `--submodule=short` the 'short' format is used. This format just shows the names of the commits at the beginning and end of the range. When `--submodule` or `--submodule=log` is specified, the 'log' format is used. This format lists the commits in the range like linkgit:git-submodule[1] `summary` does. When `--submodule=diff` is specified, the 'diff' format is used. This format shows an inline diff of the changes in the submodule contents between the commit range. Defaults to `diff.submodule` or the 'short' format if the config option is unset."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:258 en/git-branch.txt:139 en/git-for-each-ref.txt:60 en/git-grep.txt:222 en/git-show-branch.txt:119 en/git-tag.txt:125
#, no-wrap, priority:280
msgid "--color[=<when>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:262
msgid "Show colored diff. `--color` (i.e. without '=<when>') is the same as `--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:265
#, no-wrap, priority:280
msgid ""
"\tIt can be changed by the `color.ui` and `color.diff`\n"
"\tconfiguration settings.\n"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:267 en/git-branch.txt:144 en/git-grep.txt:226 en/git-show-branch.txt:124
#, ignore-same, no-wrap, priority:280
msgid "--no-color"
#. type: Plain text
#: en/diff-options.txt:269
msgid "Turn off colored diff."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:271
#, no-wrap, priority:280
msgid "\tThis can be used to override configuration settings.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:273
#, no-wrap, priority:280
msgid "\tIt is the same as `--color=never`.\n"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:274
#, no-wrap, priority:280
msgid "--color-moved[=<mode>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:276
msgid "Moved lines of code are colored differently."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:278
#, no-wrap, priority:280
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:282
#, no-wrap, priority:280
msgid ""
"\tThe <mode> defaults to 'no' if the option is not given\n"
"\tand to 'zebra' if the option with no mode is given.\n"
"\tThe mode must be one of:\n"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:284 en/diff-options.txt:326
#, ignore-same, no-wrap, priority:280
msgid "no"
msgstr "no"
#. type: Plain text
#: en/diff-options.txt:286
msgid "Moved lines are not highlighted."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:286 en/git-commit.txt:212
#, ignore-same, no-wrap, priority:280
msgid "default"
msgstr "default"
#. type: Plain text
#: en/diff-options.txt:289
msgid "Is a synonym for `zebra`. This may change to a more sensible mode in the future."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:289 en/diff-options.txt:358
#, ignore-same, no-wrap, priority:280
msgid "plain"
msgstr "plain"
#. type: Plain text
#: en/diff-options.txt:296
msgid "Any line that is added in one location and was removed in another location will be colored with 'color.diff.newMoved'. Similarly 'color.diff.oldMoved' will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:296
#, ignore-same, no-wrap, priority:280
msgid "blocks"
msgstr "blocks"
#. type: Plain text
#: en/diff-options.txt:301
msgid "Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are painted using either the 'color.diff.{old,new}Moved' color. Adjacent blocks cannot be told apart."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:301
#, ignore-same, no-wrap, priority:280
msgid "zebra"
msgstr "zebra"
#. type: Plain text
#: en/diff-options.txt:306
msgid "Blocks of moved text are detected as in 'blocks' mode. The blocks are painted using either the 'color.diff.{old,new}Moved' color or 'color.diff.{old,new}MovedAlternative'. The change between the two colors indicates that a new block was detected."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:306
#, ignore-same, no-wrap, priority:280
msgid "dimmed-zebra"
msgstr "dimmed-zebra"
#. type: Plain text
#: en/diff-options.txt:311
msgid "Similar to 'zebra', but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. `dimmed_zebra` is a deprecated synonym."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:313
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved"
#. type: Plain text
#: en/diff-options.txt:316
msgid "Turn off move detection. This can be used to override configuration settings. It is the same as `--color-moved=no`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:317
#, no-wrap, priority:280
msgid "--color-moved-ws=<modes>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:320
msgid "This configures how whitespace is ignored when performing the move detection for `--color-moved`."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:322
#, no-wrap, priority:280
msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:324
#, no-wrap, priority:280
msgid "\tThese modes can be given as a comma separated list:\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:328
msgid "Do not ignore whitespace when performing move detection."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:328 en/merge-strategies.txt:61
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-at-eol"
msgstr "ignore-space-at-eol"
#. type: Plain text
#: en/diff-options.txt:330 en/diff-options.txt:665
msgid "Ignore changes in whitespace at EOL."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:330 en/merge-strategies.txt:59
#, ignore-same, no-wrap, priority:280
msgid "ignore-space-change"
msgstr "ignore-space-change"
#. type: Plain text
#: en/diff-options.txt:334 en/diff-options.txt:671
msgid "Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:334 en/merge-strategies.txt:60
#, ignore-same, no-wrap, priority:280
msgid "ignore-all-space"
msgstr "ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:337
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:337
#, ignore-same, no-wrap, priority:280
msgid "allow-indentation-change"
msgstr "allow-indentation-change"
#. type: Plain text
#: en/diff-options.txt:342
msgid "Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in whitespace is the same per line. This is incompatible with the other modes."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:344
#, ignore-same, no-wrap, priority:280
msgid "--no-color-moved-ws"
#. type: Plain text
#: en/diff-options.txt:348
msgid "Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as `--color-moved-ws=no`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:349
#, no-wrap, priority:280
msgid "--word-diff[=<mode>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:354
msgid "Show a word diff, using the <mode> to delimit changed words. By default, words are delimited by whitespace; see `--word-diff-regex` below. The <mode> defaults to 'plain', and must be one of:"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:358
msgid "Highlight changed words using only colors. Implies `--color`."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:362
msgid "Show words as `[-removed-]` and `{+added+}`. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:362
#, ignore-same, no-wrap, priority:280
msgid "porcelain"
msgstr "porcelain"
#. type: Plain text
#: en/diff-options.txt:369
msgid "Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the usual unified diff format, starting with a `+`/`-`/` ` character at the beginning of the line and extending to the end of the line. Newlines in the input are represented by a tilde `~` on a line of its own."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:369 en/git-daemon.txt:131 en/git-submodule.txt:172
#, ignore-same, no-wrap, priority:280
msgid "none"
msgstr "none"
#. type: Plain text
#: en/diff-options.txt:371
msgid "Disable word diff again."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:375
msgid "Note that despite the name of the first mode, color is used to highlight the changed parts in all modes if enabled."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:376
#, no-wrap, priority:280
msgid "--word-diff-regex=<regex>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:380
msgid "Use <regex> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies `--word-diff` unless it was already enabled."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:388
msgid "Every non-overlapping match of the <regex> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append `|[^[:space:]]` to your regular expression to make sure that it matches all non-whitespace characters. A match that contains a newline is silently truncated(!) at the newline."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:391
msgid "For example, `--word-diff-regex=.` will treat each character as a word and, correspondingly, show differences character by character."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:396
msgid "The regex can also be set via a diff driver or configuration option, see linkgit:gitattributes[5] or linkgit:git-config[1]. Giving it explicitly overrides any diff driver or configuration setting. Diff drivers override configuration settings."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:397
#, no-wrap, priority:280
msgid "--color-words[=<regex>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:400
msgid "Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-diff-regex=<regex>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:402 en/git-status.txt:143
#, ignore-same, no-wrap, priority:280
msgid "--no-renames"
#. type: Plain text
#: en/diff-options.txt:405
msgid "Turn off rename detection, even when the configuration file gives the default to do so."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:406
#, ignore-same, no-wrap, priority:280
msgid "--[no-]rename-empty"
#. type: Plain text
#: en/diff-options.txt:408
msgid "Whether to use empty blobs as rename source."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:410 en/git-apply.txt:58
#, ignore-same, no-wrap, priority:280
msgid "--check"
#. type: Plain text
#: en/diff-options.txt:419
msgid "Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by `core.whitespace` configuration. By default, trailing whitespaces (including lines that consist solely of whitespaces) and a space character that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible with --exit-code."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:420
#, no-wrap, priority:280
msgid "--ws-error-highlight=<kind>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:429
msgid "Highlight whitespace errors in the `context`, `old` or `new` lines of the diff. Multiple values are separated by comma, `none` resets previous values, `default` reset the list to `new` and `all` is a shorthand for `old,new,context`. When this option is not given, and the configuration variable `diff.wsErrorHighlight` is not set, only whitespace errors in `new` lines are highlighted. The whitespace errors are colored with `color.diff.whitespace`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:432
#, ignore-same, no-wrap, priority:280
msgid "--full-index"
#. type: Plain text
#: en/diff-options.txt:436
msgid "Instead of the first handful of characters, show the full pre- and post-image blob object names on the \"index\" line when generating patch format output."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:437 en/git-apply.txt:160
#, ignore-same, no-wrap, priority:280
msgid "--binary"
#. type: Plain text
#: en/diff-options.txt:440
msgid "In addition to `--full-index`, output a binary diff that can be applied with `git-apply`. Implies `--patch`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:441 en/git-ls-files.txt:154 en/git-ls-tree.txt:63 en/git-show-ref.txt:65
#, no-wrap, priority:280
msgid "--abbrev[=<n>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:448
msgid "Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header lines, show only a partial prefix. This is independent of the `--full-index` option above, which controls the diff-patch output format. Non default number of digits can be specified with `--abbrev=<n>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:449
#, no-wrap, priority:280
msgid "-B[<n>][/<m>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:450
#, no-wrap, priority:280
msgid "--break-rewrites[=[<n>][/<m>]]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:453
msgid "Break complete rewrite changes into pairs of delete and create. This serves two purposes:"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:463
msgid "It affects the way a change that amounts to a total rewrite of a file not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of everything new, and the number `m` controls this aspect of the -B option (defaults to 60%). `-B/70%` specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines)."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:471
msgid "When used with -M, a totally-rewritten file is also considered as the source of a rename (usually -M only considers a file that disappeared as the source of a rename), and the number `n` controls this aspect of the -B option (defaults to 50%). `-B20%` specifies that a change with addition and deletion compared to 20% or more of the file's size are eligible for being picked up as a possible source of a rename to another file."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:472
#, no-wrap, priority:280
msgid "-M[<n>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:473 en/git-status.txt:147
#, no-wrap, priority:280
msgid "--find-renames[=<n>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:476
#, no-wrap, priority:280
msgid "\tDetect renames.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:481
#, no-wrap, priority:280
msgid ""
"\tIf generating diffs, detect and report renames for each commit.\n"
"\tFor following files across renames while traversing history, see\n"
"\t`--follow`.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:491
#, no-wrap, priority:280
msgid ""
"\tIf `n` is specified, it is a threshold on the similarity\n"
"\tindex (i.e. amount of addition/deletions compared to the\n"
"\tfile's size). For example, `-M90%` means Git should consider a\n"
"\tdelete/add pair to be a rename if more than 90% of the file\n"
"\thasn't changed. Without a `%` sign, the number is to be read as\n"
"\ta fraction, with a decimal point before it. I.e., `-M5` becomes\n"
"\t0.5, and is thus the same as `-M50%`. Similarly, `-M05` is\n"
"\tthe same as `-M5%`. To limit detection to exact renames, use\n"
"\t`-M100%`. The default similarity index is 50%.\n"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:492
#, no-wrap, priority:280
msgid "-C[<n>]"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:493
#, no-wrap, priority:280
msgid "--find-copies[=<n>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:496
msgid "Detect copies as well as renames. See also `--find-copies-harder`. If `n` is specified, it has the same meaning as for `-M<n>`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:497 en/git-svn.txt:626
#, ignore-same, no-wrap, priority:280
msgid "--find-copies-harder"
#. type: Plain text
#: en/diff-options.txt:505
msgid "For performance reasons, by default, `-C` option finds copies only if the original file of the copy was modified in the same changeset. This flag makes the command inspect unmodified files as candidates for the source of copy. This is a very expensive operation for large projects, so use it with caution. Giving more than one `-C` option has the same effect."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:506 en/git-branch.txt:103 en/git-http-push.txt:45
#, no-wrap, priority:280
msgid "-D"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:507
#, ignore-same, no-wrap, priority:280
msgid "--irreversible-delete"
#. type: Plain text
#: en/diff-options.txt:515
msgid "Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and `/dev/null`. The resulting patch is not meant to be applied with `patch` or `git apply`; this is solely for people who want to just concentrate on reviewing the text after the change. In addition, the output obviously lacks enough information to apply such a patch in reverse, even manually, hence the name of the option."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:518
msgid "When used together with `-B`, omit also the preimage in the deletion part of a delete/create pair."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:519 en/git-svn.txt:625
#, no-wrap, priority:280
msgid "-l<num>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:525
msgid "The `-M` and `-C` options require O(n^2) processing time where n is the number of potential rename/copy targets. This option prevents rename/copy detection from running if the number of rename/copy targets exceeds the specified number."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:527
#, ignore-ellipsis, no-wrap, priority:280
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:538
#, ignore-ellipsis, priority:280
msgid "Select only files that are Added (`A`), Copied (`C`), Deleted (`D`), Modified (`M`), Renamed (`R`), have their type (i.e. regular file, symlink, submodule, ...) changed (`T`), are Unmerged (`U`), are Unknown (`X`), or have had their pairing Broken (`B`). Any combination of the filter characters (including none) can be used. When `*` (All-or-none) is added to the combination, all paths are selected if there is any file that matches other criteria in the comparison; if there is no file that matches other criteria, nothing is selected."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:541
msgid "Also, these upper-case letters can be downcased to exclude. E.g. `--diff-filter=ad` excludes added and deleted paths."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:547
msgid "Note that not all diffs can feature all types. For instance, diffs from the index to the working tree can never have Added entries (because the set of paths included in the diff is limited by what is in the index). Similarly, copied and renamed entries cannot appear if detection for those types is disabled."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:548
#, no-wrap, priority:280
msgid "-S<string>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:552
msgid "Look for differences that change the number of occurrences of the specified string (i.e. addition/deletion) in a file. Intended for the scripter's use."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:558
msgid "It is useful when you're looking for an exact block of code (like a struct), and want to know the history of that block since it first came into being: use the feature iteratively to feed the interesting block in the preimage back into `-S`, and keep going until you get the very first version of the block."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:560
msgid "Binary files are searched as well."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:561
#, no-wrap, priority:280
msgid "-G<regex>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:564
msgid "Look for differences whose patch text contains added/removed lines that match <regex>."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:568
msgid "To illustrate the difference between `-S<regex> --pickaxe-regex` and `-G<regex>`, consider a commit with the following diff in the same file:"
msgstr ""
#. type: delimited block -
#: en/diff-options.txt:573
#, ignore-ellipsis, no-wrap, priority:280
msgstr ""
#. type: Plain text
#: en/diff-options.txt:578
msgid "While `git log -G\"frotz\\(nitfol\"` will show this commit, `git log -S\"frotz\\(nitfol\" --pickaxe-regex` will not (because the number of occurrences of that string did not change)."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:581
msgid "Unless `--text` is supplied patches of binary files without a textconv filter will be ignored."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:584
msgid "See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:585
#, no-wrap, priority:280
msgid "--find-object=<object-id>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:590
msgid "Look for differences that change the number of occurrences of the specified object. Similar to `-S`, just the argument is different in that it doesn't search for a specific string but for a specific object id."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:593
msgid "The object can be a blob or a submodule commit. It implies the `-t` option in `git-log` to also find trees."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:594
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-all"
#. type: Plain text
#: en/diff-options.txt:598
msgid "When `-S` or `-G` finds a change, show all the changes in that changeset, not just the files that contain the change in <string>."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:599
#, ignore-same, no-wrap, priority:280
msgid "--pickaxe-regex"
#. type: Plain text
#: en/diff-options.txt:602
msgid "Treat the <string> given to `-S` as an extended POSIX regular expression to match."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:605 en/git-mergetool.txt:95
#, no-wrap, priority:280
msgid "-O<orderfile>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:610
msgid "Control the order in which files appear in the output. This overrides the `diff.orderFile` configuration variable (see linkgit:git-config[1]). To cancel `diff.orderFile`, use `-O/dev/null`."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:622
msgid "The output order is determined by the order of glob patterns in <orderfile>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. All files with pathnames that do not match any pattern are output last, as if there was an implicit match-all pattern at the end of the file. If multiple pathnames have the same rank (they match the same pattern but no earlier patterns), their output order relative to each other is the normal order."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:624
msgid "<orderfile> is parsed as follows:"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:628
msgid "Blank lines are ignored, so they can be used as separators for readability."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:632
msgid "Lines starting with a hash (\"`#`\") are ignored, so they can be used for comments. Add a backslash (\"`\\`\") to the beginning of the pattern if it starts with a hash."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:634
msgid "Each other line contains a single pattern."
msgstr ""
#. type: Plain text
#: en/diff-options.txt:641
msgid "Patterns have the same syntax and semantics as patterns used for fnmatch(3) without the FNM_PATHNAME flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern \"`foo*bar`\" matches \"`fooasdfbar`\" and \"`foo/bar/baz/asdf`\" but not \"`foobarx`\"."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:643 en/git-apply.txt:104 en/git-cvsimport.txt:168
#, no-wrap, priority:280
msgid "-R"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:646
msgid "Swap two inputs; that is, show differences from index or on-disk file to tree contents."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:647
#, no-wrap, priority:280
msgid "--relative[=<path>]"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:654
msgid "When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative to by giving a <path> as an argument."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:656 en/fetch-options.txt:4 en/git-archimport.txt:99 en/git-branch.txt:166 en/git-checkout-index.txt:38 en/git-commit.txt:65 en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:102 en/git-help.txt:45 en/git-merge-base.txt:71 en/git-merge-index.txt:26 en/git-repack.txt:31 en/git-show-branch.txt:47 en/git-stash.txt:154 en/git-tag.txt:60
#, ignore-same, no-wrap, priority:280
#. type: Labeled list
#: en/diff-options.txt:657 en/git-grep.txt:103
#, ignore-same, no-wrap, priority:280
msgid "--text"
#. type: Plain text
#: en/diff-options.txt:659
msgid "Treat all files as text."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:660
#, ignore-same, no-wrap, priority:280
msgid "--ignore-cr-at-eol"
#. type: Plain text
#: en/diff-options.txt:662
msgid "Ignore carriage-return at the end of line when doing a comparison."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:663
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-at-eol"
#. type: Labeled list
#: en/diff-options.txt:667 en/git-am.txt:107 en/git-apply.txt:182
#, ignore-same, no-wrap, priority:280
msgid "--ignore-space-change"
#. type: Labeled list
#: en/diff-options.txt:672 en/git-blame.txt:84 en/git-cvsexportcommit.txt:71 en/git-grep.txt:135 en/git-hash-object.txt:29 en/git-help.txt:79
#, ignore-same, no-wrap, priority:280
#. type: Labeled list
#: en/diff-options.txt:673
#, ignore-same, no-wrap, priority:280
msgid "--ignore-all-space"
#. type: Plain text
#: en/diff-options.txt:677
msgid "Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:678
#, ignore-same, no-wrap, priority:280
msgid "--ignore-blank-lines"
#. type: Plain text
#: en/diff-options.txt:680
msgid "Ignore changes whose lines are all blank."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:681
#, no-wrap, priority:280
msgid "--inter-hunk-context=<lines>"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:686
msgid "Show the context between diff hunks, up to the specified number of lines, thereby fusing hunks that are close to each other. Defaults to `diff.interHunkContext` or 0 if the config option is unset."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:687 en/git-cvsexportcommit.txt:77 en/git-grep.txt:262 en/git-restore.txt:57
#, no-wrap, priority:280
msgid "-W"
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:688 en/git-grep.txt:263
#, ignore-same, no-wrap, priority:280
msgid "--function-context"
#. type: Plain text
#: en/diff-options.txt:690
msgid "Show whole surrounding functions of changes."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:693 en/git-ls-remote.txt:48
#, ignore-same, no-wrap, priority:280
msgid "--exit-code"
#. type: Plain text
#: en/diff-options.txt:697
msgid "Make the program exit with codes similar to diff(1). That is, it exits with 1 if there were differences and 0 means no differences."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:698 en/fetch-options.txt:222 en/git-am.txt:74 en/git-branch.txt:193 en/git-bundle.txt:106 en/git-checkout-index.txt:31 en/git-checkout.txt:108 en/git-clean.txt:54 en/git-clone.txt:120 en/git-commit.txt:330 en/git-fast-import.txt:42 en/git-fetch-pack.txt:49 en/git-format-patch.txt:323 en/git-gc.txt:68 en/git-grep.txt:314 en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:39 en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78 en/git-push.txt:362 en/git-read-tree.txt:133 en/git-rebase.txt:362 en/git-reset.txt:100 en/git-restore.txt:66 en/git-rev-parse.txt:114 en/git-rm.txt:74 en/git-send-email.txt:409 en/git-show-ref.txt:71 en/git-stash.txt:216 en/git-submodule.txt:266 en/git-svn.txt:671 en/git-switch.txt:141 en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:144 en/rev-list-options.txt:220
#, ignore-same, no-wrap, priority:300
msgid "--quiet"
#. type: Plain text
#: en/diff-options.txt:700
msgid "Disable all output of the program. Implies `--exit-code`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:703
#, ignore-same, no-wrap, priority:280
msgid "--ext-diff"
#. type: Plain text
#: en/diff-options.txt:707
msgid "Allow an external diff helper to be executed. If you set an external diff driver with linkgit:gitattributes[5], you need to use this option with linkgit:git-log[1] and friends."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:708
#, ignore-same, no-wrap, priority:280
msgid "--no-ext-diff"