Newer
Older
"This configures how whitespace is ignored when performing the move detection"
" for `--color-moved`."
msgid "\tIt can be set by the `diff.colorMovedWS` configuration setting.\n"
#: en/diff-options.txt:307
#, no-wrap
msgid "\tThese modes can be given as a comma separated list:\n"
#: en/diff-options.txt:311
msgid "Do not ignore whitespace when performing move detection."
#. type: Labeled list
#: en/diff-options.txt:311 en/merge-strategies.txt:61
#: en/diff-options.txt:313 en/diff-options.txt:645
msgid "Ignore changes in whitespace at EOL."
#. type: Labeled list
#: en/diff-options.txt:313 en/merge-strategies.txt:59
#: en/diff-options.txt:317 en/diff-options.txt:651
"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."
#. type: Labeled list
#: en/diff-options.txt:317 en/merge-strategies.txt:60
msgid "ignore-all-space"
msgstr ""
"Ignore whitespace when comparing lines. This ignores differences even if one"
" line has whitespace where the other line has none."
#. type: Labeled list
#: en/diff-options.txt:325
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."
#. type: Labeled list
msgid "--no-color-moved-ws"
msgstr "--no-color-moved-ws"
"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`."
#. type: Labeled list
#: en/diff-options.txt:332
#, no-wrap
msgid "--word-diff[=<mode>]"
msgstr ""
"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:"
#: en/diff-options.txt:341
msgid "Highlight changed words using only colors. Implies `--color`."
"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."
#. type: Labeled list
#: en/diff-options.txt:345
#, no-wrap
msgid "porcelain"
msgstr ""
"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."
#. type: Labeled list
#: en/diff-options.txt:352 en/git-daemon.txt:131 en/git-submodule.txt:162
#, no-wrap
msgid "none"
msgstr ""
#: en/diff-options.txt:354
msgid "Disable word diff again."
"Note that despite the name of the first mode, color is used to highlight the"
" changed parts in all modes if enabled."
#. type: Labeled list
#: en/diff-options.txt:359
#, no-wrap
msgid "--word-diff-regex=<regex>"
msgstr ""
"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."
"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."
"For example, `--word-diff-regex=.` will treat each character as a word and, "
"correspondingly, show differences character by character."
"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."
#. type: Labeled list
#: en/diff-options.txt:380
#, no-wrap
msgid "--color-words[=<regex>]"
msgstr ""
"Equivalent to `--word-diff=color` plus (if a regex was specified) `--word-"
"diff-regex=<regex>`."
#. type: Labeled list
#: en/diff-options.txt:385 en/git-status.txt:139
msgid "--no-renames"
msgstr "--no-renames"
"Turn off rename detection, even when the configuration file gives the "
"default to do so."
#. type: Labeled list
#: en/diff-options.txt:390 en/git-apply.txt:58
msgid "--check"
msgstr "--check"
"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."
#. type: Labeled list
#: en/diff-options.txt:400
#, no-wrap
msgid "--ws-error-highlight=<kind>"
msgstr ""
"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`."
#. type: Labeled list
msgid "--full-index"
msgstr "--full-index"
"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."
#. type: Labeled list
#: en/diff-options.txt:417 en/git-apply.txt:160
msgid "--binary"
msgstr "--binary"
"In addition to `--full-index`, output a binary diff that can be applied with"
" `git-apply`."
#: en/diff-options.txt:421 en/git-ls-files.txt:152 en/git-ls-tree.txt:63
#: en/git-show-ref.txt:65
#, no-wrap
msgid "--abbrev[=<n>]"
msgstr ""
"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>`."
#. type: Labeled list
#: en/diff-options.txt:429
#, no-wrap
msgid "-B[<n>][/<m>]"
#. type: Labeled list
#: en/diff-options.txt:430
#, no-wrap
msgid "--break-rewrites[=[<n>][/<m>]]"
msgstr ""
#. type: Plain text
"Break complete rewrite changes into pairs of delete and create. This serves "
"two purposes:"
"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)."
"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."
#. type: Labeled list
#. type: Labeled list
#: en/diff-options.txt:453 en/git-status.txt:143
#: en/diff-options.txt:456
#, no-wrap
msgid "\tDetect renames.\n"
#. type: Plain text
#: en/diff-options.txt:461
#, no-wrap
"\tIf generating diffs, detect and report renames for each commit.\n"
"\tFor following files across renames while traversing history, see\n"
"\t`--follow`.\n"
#. type: Plain text
#: en/diff-options.txt:471
#, no-wrap
"\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"
#. type: Labeled list
#. type: Labeled list
"Detect copies as well as renames. See also `--find-copies-harder`. If `n` "
"is specified, it has the same meaning as for `-M<n>`."
#. type: Labeled list
#: en/diff-options.txt:477 en/git-svn.txt:626
#, ignore-same, no-wrap
msgid "--find-copies-harder"
msgstr "--find-copies-harder"
#. type: Plain text
"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."
#. type: Labeled list
#: en/diff-options.txt:486 en/git-branch.txt:91 en/git-http-push.txt:45
#. type: Labeled list
#: en/diff-options.txt:487
#, ignore-same, no-wrap
msgid "--irreversible-delete"
msgstr "--irreversible-delete"
"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."
"When used together with `-B`, omit also the preimage in the deletion part of"
" a delete/create pair."
#. type: Labeled list
#: en/diff-options.txt:499 en/git-svn.txt:625
"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."
#. type: Labeled list
msgid "--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]"
"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."
#. type: Plain text
#: en/diff-options.txt:521
msgid ""
"Also, these upper-case letters can be downcased to exclude. E.g. `--diff-"
"filter=ad` excludes added and deleted paths."
"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."
#. type: Labeled list
"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."
"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."
#. type: Plain text
#: en/diff-options.txt:540
msgid "Binary files are searched as well."
"Look for differences whose patch text contains added/removed lines that "
"match <regex>."
#. type: Plain text
#: en/diff-options.txt:548
msgid ""
"To illustrate the difference between `-S<regex> --pickaxe-regex` and "
"`-G<regex>`, consider a commit with the following diff in the same file:"
#. type: delimited block -
#: en/diff-options.txt:553
msgid ""
"+ return !regexec(regexp, two->ptr, 1, ®match, 0);\n"
"...\n"
"- hit = !regexec(regexp, mf2.ptr, 1, ®match, 0);\n"
"While `git log -G\"regexec\\(regexp\"` will show this commit, `git log "
"-S\"regexec\\(regexp\" --pickaxe-regex` will not (because the number of "
"occurrences of that string did not change)."
#. type: Plain text
#: en/diff-options.txt:561
msgid ""
"Unless `--text` is supplied patches of binary files without a textconv "
"filter will be ignored."
"See the 'pickaxe' entry in linkgit:gitdiffcore[7] for more information."
"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."
"The object can be a blob or a submodule commit. It implies the `-t` option "
"in `git-log` to also find trees."
#: en/diff-options.txt:574
#, ignore-same, no-wrap
msgid "--pickaxe-all"
msgstr "--pickaxe-all"
"When `-S` or `-G` finds a change, show all the changes in that changeset, "
"not just the files that contain the change in <string>."
#. type: Labeled list
#: en/diff-options.txt:579
#, ignore-same, no-wrap
msgid "--pickaxe-regex"
msgstr "--pickaxe-regex"
"Treat the <string> given to `-S` as an extended POSIX regular expression to "
"match."
#. type: Labeled list
#: en/diff-options.txt:585 en/git-mergetool.txt:93
"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`."
#. type: Plain text
#: en/diff-options.txt:602
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."
#: en/diff-options.txt:604
msgid "<orderfile> is parsed as follows:"
#. type: Plain text
#: en/diff-options.txt:608
msgid ""
"Blank lines are ignored, so they can be used as separators for readability."
"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."
#. type: Plain text
#: en/diff-options.txt:614
msgid "Each other line contains a single pattern."
"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`\"."
#. type: Labeled list
#: en/diff-options.txt:623 en/git-apply.txt:104 en/git-cvsimport.txt:168
"Swap two inputs; that is, show differences from index or on-disk file to "
"tree contents."
#. type: Labeled list
"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."
#. type: Labeled list
#: en/diff-options.txt:636 en/fetch-options.txt:4 en/git-archimport.txt:99
#: en/git-branch.txt:153 en/git-checkout-index.txt:38 en/git-commit.txt:64
#: en/git-cvsexportcommit.txt:45 en/git-cvsimport.txt:135 en/git-grep.txt:101
#: 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-tag.txt:60
#. type: Labeled list
#: en/diff-options.txt:637 en/git-grep.txt:102
msgid "--text"
msgstr "--text"
#: en/diff-options.txt:639
msgid "Treat all files as text."
#. type: Labeled list
msgid "--ignore-cr-at-eol"
msgstr "--ignore-cr-at-eol"
#. type: Plain text
#: en/diff-options.txt:642
msgid "Ignore carriage-return at the end of line when doing a comparison."
msgstr ""
#. type: Labeled list
msgid "--ignore-space-at-eol"
msgstr "--ignore-space-at-eol"
#. type: Labeled list
#: en/diff-options.txt:647 en/git-am.txt:102 en/git-apply.txt:182
msgid "--ignore-space-change"
msgstr "--ignore-space-change"
#. type: Labeled list
#: en/diff-options.txt:652 en/git-blame.txt:83 en/git-cvsexportcommit.txt:71
#: en/git-grep.txt:134 en/git-hash-object.txt:31 en/git-help.txt:79
#. type: Labeled list
msgid "--ignore-all-space"
msgstr "--ignore-all-space"
#: en/diff-options.txt:657
msgid ""
"Ignore whitespace when comparing lines. This ignores differences even if "
"one line has whitespace where the other line has none."
#. type: Labeled list
#: en/diff-options.txt:658
#, ignore-same, no-wrap
msgid "--ignore-blank-lines"
msgstr "--ignore-blank-lines"
#: en/diff-options.txt:660
msgid "Ignore changes whose lines are all blank."
#. type: Labeled list
msgid "--inter-hunk-context=<lines>"
#. type: Plain text
"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:667 en/git-cvsexportcommit.txt:77 en/git-grep.txt:261
#. type: Labeled list
#: en/diff-options.txt:668 en/git-grep.txt:262
#, ignore-same, no-wrap
msgid "--function-context"
msgstr "--function-context"
#: en/diff-options.txt:670
msgid "Show whole surrounding functions of changes."
#. type: Labeled list
#: en/diff-options.txt:673 en/git-ls-remote.txt:46
#, ignore-same, no-wrap
msgid "--exit-code"
msgstr "--exit-code"
"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."
#. type: Labeled list
#: en/diff-options.txt:678 en/fetch-options.txt:199 en/git-am.txt:74
#: en/git-branch.txt:173 en/git-checkout-index.txt:31 en/git-checkout.txt:118
#: en/git-clean.txt:52 en/git-clone.txt:118 en/git-commit.txt:314
#: en/git-fast-import.txt:42 en/git-fetch-pack.txt:49
#: en/git-format-patch.txt:296 en/git-gc.txt:87 en/git-grep.txt:296
#: en/git-imap-send.txt:37 en/git-init.txt:42 en/git-ls-remote.txt:37
#: en/git-notes.txt:207 en/git-prune-packed.txt:37 en/git-pull.txt:78
#: en/git-push.txt:362 en/git-rebase.txt:310 en/git-reset.txt:97
#: en/git-rev-parse.txt:114 en/git-rm.txt:67 en/git-send-email.txt:401
#: en/git-show-ref.txt:71 en/git-submodule.txt:244 en/git-svn.txt:671
#: en/git-symbolic-ref.txt:40 en/git-worktree.txt:185 en/merge-options.txt:122
#: en/rev-list-options.txt:212
#, ignore-same, no-wrap
msgid "--quiet"
msgstr "--quiet"
#: en/diff-options.txt:680
msgid "Disable all output of the program. Implies `--exit-code`."
#. type: Labeled list
msgid "--ext-diff"
msgstr "--ext-diff"
"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."
#. type: Labeled list
msgid "--no-ext-diff"
msgstr "--no-ext-diff"
#: en/diff-options.txt:690
msgid "Disallow external diff drivers."
#. type: Labeled list
#: en/diff-options.txt:691 en/git-cat-file.txt:60 en/git-grep.txt:105
msgid "--textconv"
msgstr "--textconv"
#: en/diff-options.txt:692 en/git-grep.txt:108
msgid "--no-textconv"
msgstr "--no-textconv"
"Allow (or disallow) external text conversion filters to be run when "
"comparing binary files. See linkgit:gitattributes[5] for details. Because "
"textconv filters are typically a one-way conversion, the resulting diff is "
"suitable for human consumption, but cannot be applied. For this reason, "
"textconv filters are enabled by default only for linkgit:git-diff[1] and "
"linkgit:git-log[1], but not for linkgit:git-format-patch[1] or diff plumbing"
" commands."
#. type: Labeled list
#: en/diff-options.txt:702 en/git-status.txt:85
#, no-wrap
msgid "--ignore-submodules[=<when>]"
"Ignore changes to submodules in the diff generation. <when> can be either "
"\"none\", \"untracked\", \"dirty\" or \"all\", which is the default. Using "
"\"none\" will consider the submodule modified when it either contains "
"untracked or modified files or its HEAD differs from the commit recorded in "
"the superproject and can be used to override any settings of the 'ignore' "
"option in linkgit:git-config[1] or linkgit:gitmodules[5]. When \"untracked\""
" is used submodules are not considered dirty when they only contain "
"untracked content (but they are still scanned for modified content). Using "
"\"dirty\" ignores all changes to the work tree of submodules, only changes "
"to the commits stored in the superproject are shown (this was the behavior "
"until 1.7.0). Using \"all\" hides all changes to submodules."
#. type: Labeled list
#: en/diff-options.txt:715
#, no-wrap
msgid "--src-prefix=<prefix>"
msgstr ""
#: en/diff-options.txt:717
msgid "Show the given source prefix instead of \"a/\"."
#. type: Labeled list
#: en/diff-options.txt:718
#, no-wrap
msgid "--dst-prefix=<prefix>"
msgstr ""
#: en/diff-options.txt:720
msgid "Show the given destination prefix instead of \"b/\"."
#. type: Labeled list
msgid "--no-prefix"
msgstr "--no-prefix"
#: en/diff-options.txt:723
msgid "Do not show any source or destination prefix."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:724
#, no-wrap
msgid "--line-prefix=<prefix>"
msgstr ""
#: en/diff-options.txt:726
msgid "Prepend an additional prefix to every line of output."
msgid "--ita-invisible-in-index"
msgstr "--ita-invisible-in-index"
#. type: Plain text
"By default entries added by \"git add -N\" appear as an existing empty file "
"in \"git diff\" and a new file in \"git diff --cached\". This option makes "
"the entry appear as a new file in \"git diff\" and non-existent in \"git "
"diff --cached\". This option could be reverted with `--ita-visible-in-"
"index`. Both options are experimental and could be removed in future."
"For more detailed explanation on these common options, see also "
"linkgit:gitdiffcore[7]."
#: en/fetch-options.txt:1 en/git-add.txt:123 en/git-branch.txt:154
#: en/git-checkout-index.txt:39 en/git-commit.txt:65 en/git-describe.txt:50
#: en/git-fetch-pack.txt:35 en/git-help.txt:46 en/git-http-push.txt:25
#: en/git-merge-base.txt:72 en/git-name-rev.txt:42 en/git-pack-objects.txt:77
#: en/git-pack-redundant.txt:32 en/git-pack-refs.txt:48 en/git-push.txt:149
#: en/git-reflog.txt:72 en/git-rev-parse.txt:161 en/git-send-pack.txt:37