Newer
Older
msgid "It is followed by one or more extended header lines:"
msgstr ""
#: en/diff-generate-patch.txt:39
#, no-wrap
"old mode <mode>\n"
"new mode <mode>\n"
"deleted file mode <mode>\n"
"new file mode <mode>\n"
"copy from <path>\n"
"copy to <path>\n"
"rename from <path>\n"
"rename to <path>\n"
"similarity index <number>\n"
"dissimilarity index <number>\n"
"index <hash>..<hash> <mode>\n"
"File modes are printed as 6-digit octal numbers including the file type and "
"file permission bits."
"Path names in extended headers do not include the `a/` and `b/` prefixes."
"The similarity index is the percentage of unchanged lines, and the "
"dissimilarity index is the percentage of changed lines. It is a rounded "
"down integer, followed by a percent sign. The similarity index value of "
"100% is thus reserved for two equal files, while 100% dissimilarity means "
"that no line from the old file made it into the new one."
"The index line includes the SHA-1 checksum before and after the change. The"
" <mode> is included if the file mode does not change; otherwise, separate "
"lines indicate the old and the new mode."
"Pathnames with \"unusual\" characters are quoted as explained for the "
"configuration variable `core.quotePath` (see linkgit:git-config[1])."
"Les noms de chemin avec des caractères « inhabituels » sont cités comme "
"expliqué pour la variable de configuration `core.quotePath` (voir "
"linkgit:git-config[1])."
"All the `file1` files in the output refer to files before the commit, and "
"all the `file2` files refer to files after the commit. It is incorrect to "
"apply each change to each file sequentially. For example, this patch will "
"swap a and b:"
#: en/diff-generate-patch.txt:71
#, no-wrap
"diff --git a/a b/b\n"
"rename from a\n"
"rename to b\n"
"diff --git a/b b/a\n"
"rename from b\n"
"rename to a\n"
#. type: Title -
#: en/diff-generate-patch.txt:74
msgid "combined diff format"
msgstr "format de diff combiné"
"Any diff-generating command can take the `-c` or `--cc` option to produce a "
"'combined diff' when showing a merge. This is the default format when "
"showing merges with linkgit:git-diff[1] or linkgit:git-show[1]. Note also "
"that you can give the `-m` option to any of these commands to force "
"generation of diffs with individual parents of a merge."
#: en/diff-generate-patch.txt:84
msgid "A 'combined diff' format looks like this:"
#. type: delimited block -
#: en/diff-generate-patch.txt:93
#, no-wrap
"diff --combined describe.c\n"
"index fabadb8,cc95eb0..4866510\n"
"--- a/describe.c\n"
"+++ b/describe.c\n"
"@@@ -98,20 -98,12 +98,20 @@@\n"
"\treturn (a_date > b_date) ? -1 : (a_date == b_date) ? 0 : 1;\n"
" }\n"
#. type: delimited block -
#: en/diff-generate-patch.txt:103
#, no-wrap
"- static void describe(char *arg)\n"
" -static void describe(struct commit *cmit, int last_one)\n"
"++static void describe(char *arg, int last_one)\n"
" {\n"
" +\tunsigned char sha1[20];\n"
" +\tstruct commit *cmit;\n"
"\tstruct commit_list *list;\n"
"\tstatic int initialized = 0;\n"
"\tstruct commit_name *n;\n"
#. type: delimited block -
#: en/diff-generate-patch.txt:113
#, no-wrap
" +\tif (get_sha1(arg, sha1) < 0)\n"
" +\t\tusage(describe_usage);\n"
" +\tcmit = lookup_commit_reference(sha1);\n"
" +\tif (!cmit)\n"
" +\t\tusage(describe_usage);\n"
" +\n"
"\tif (!initialized) {\n"
"\t\tinitialized = 1;\n"
"\t\tfor_each_ref(get_name);\n"
#. type: Plain text
"It is preceded with a \"git diff\" header, that looks like this (when `-c` "
"option is used):"
#: en/diff-generate-patch.txt:119
#, no-wrap
msgid "diff --combined file\n"
#. type: Plain text
#: en/diff-generate-patch.txt:121
msgid "or like this (when `--cc` option is used):"
#: en/diff-generate-patch.txt:123
#, no-wrap
msgid " diff --cc file\n"
"It is followed by one or more extended header lines (this example shows a "
"merge with two parents):"
#: en/diff-generate-patch.txt:131
#, no-wrap
"index <hash>,<hash>..<hash>\n"
"mode <mode>,<mode>..<mode>\n"
"new file mode <mode>\n"
"deleted file mode <mode>,<mode>\n"
"The `mode <mode>,<mode>..<mode>` line appears only if at least one of the "
"<mode> is different from the rest. Extended headers with information about "
"detected contents movement (renames and copying detection) are designed to "
"work with diff of two <tree-ish> and are not used by combined diff format."
#. type: Plain text
#: en/diff-generate-patch.txt:139
msgid "It is followed by two-line from-file/to-file header"
#. type: Plain text
#: en/diff-generate-patch.txt:141
msgid "a/file"
msgstr ""
#: en/diff-generate-patch.txt:142
msgid "b/file"
"Similar to two-line header for traditional 'unified' diff format, "
"`/dev/null` is used to signal created or deleted files."
#. type: Plain text
#: en/diff-generate-patch.txt:152
msgid ""
"Chunk header format is modified to prevent people from accidentally feeding "
"it to `patch -p1`. Combined diff format was created for review of merge "
"commit changes, and was not meant for apply. The change is similar to the "
"change in the extended 'index' header:"
msgstr ""
#: en/diff-generate-patch.txt:154
#, no-wrap
msgid "@@@ <from-file-range> <from-file-range> <to-file-range> @@@\n"
"There are (number of parents + 1) `@` characters in the chunk header for "
"combined diff format."
"Unlike the traditional 'unified' diff format, which shows two files A and B "
"with a single column that has `-` (minus -- appears in A but removed in B), "
"`+` (plus -- missing in A but added to B), or `\" \"` (space -- unchanged) "
"prefix, this format compares two or more files file1, file2,... with one "
"file X, and shows how X differs from each of fileN. One column for each of "
"fileN is prepended to the output line to note how X's line is different from"
" it."
"A `-` character in the column N means that the line appears in fileN but it "
"does not appear in the result. A `+` character in the column N means that "
"the line appears in the result, and fileN does not have that line (in other "
"words, the line was added, from the point of view of that parent)."
"In the above example output, the function signature was changed from both "
"files (hence two `-` removals from both file1 and file2, plus `++` to mean "
"one line that was added does not appear in either file1 or file2). Also "
"eight other lines are the same from file1 but do not appear in file2 (hence "
"prefixed with `+`)."
"When shown by `git diff-tree -c`, it compares the parents of a merge commit "
"with the merge result (i.e. file1..fileN are the parents). When shown by "
"`git diff-files -c`, it compares the two unresolved merge parents with the "
"working tree file (i.e. file1 is stage 2 aka \"our version\", file2 is stage"
" 3 aka \"their version\")."
#. type: Labeled list
#: en/diff-options.txt:17 en/git-rebase.txt:322 en/merge-options.txt:74
msgid "--no-stat"
msgstr "--no-stat"
#: en/diff-options.txt:19
msgid "Generate plain patches without any diffstats."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:23 en/fetch-options.txt:182 en/git-add.txt:111
#: en/git-am.txt:77 en/git-checkout-index.txt:25 en/git-cvsexportcommit.txt:64
#: en/git-cvsimport.txt:98 en/git-ls-files.txt:70 en/git-mailinfo.txt:52
#: en/git-push.txt:348 en/git-read-tree.txt:44
#, ignore-same, no-wrap
msgid "-u"
msgstr "-u"
#. type: Labeled list
#: en/diff-options.txt:24 en/git-add.txt:89 en/git-checkout.txt:254
#: en/git-commit.txt:71
msgid "--patch"
msgstr "--patch"
#: en/diff-options.txt:26
msgid "Generate patch (see section on generating patches)."
#. type: Plain text
#: en/diff-options.txt:28 en/diff-options.txt:50
#. type: Labeled list
#: en/diff-options.txt:30 en/git-am.txt:34 en/git-blame.txt:74
#: en/git-cat-file.txt:40 en/git-cherry-pick.txt:100 en/git-clone.txt:66
#: en/git-commit.txt:165 en/git-diff-tree.txt:72 en/git-format-patch.txt:116
#: en/git-ls-files.txt:59 en/git-revert.txt:89 en/git-shortlog.txt:34
#: en/git-show-ref.txt:53 en/git-status.txt:27 en/git-stripspace.txt:38
#: en/git-svn.txt:46 en/git-tag.txt:64 en/git-verify-pack.txt:31
#, ignore-same, no-wrap
msgid "-s"
msgstr "-s"
#. type: Labeled list
#: en/diff-options.txt:31
#, ignore-same, no-wrap
msgid "--no-patch"
msgstr "--no-patch"
"Suppress diff output. Useful for commands like `git show` that show the "
"patch by default, or to cancel the effect of `--patch`."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:36
#, no-wrap
msgid "-U<n>"
#: en/diff-options.txt:40
msgid "Generate diffs with <n> lines of context instead of the usual three."
#: en/diff-options.txt:42
#, no-wrap
msgid "\tImplies `-p`.\n"
#: en/diff-options.txt:45 en/git-replace.txt:78 en/git-verify-commit.txt:19
#: en/git-verify-tag.txt:19
#, ignore-same, no-wrap
msgid "--raw"
msgstr "--raw"
#. type: Plain text
#: en/diff-options.txt:48
msgid "\tGenerate the diff in raw format.\n"
#: en/diff-options.txt:58
#, no-wrap
"\tFor each commit, show a summary of changes using the raw diff\n"
"\tformat. See the \"RAW OUTPUT FORMAT\" section of\n"
"\tlinkgit:git-diff[1]. This is different from showing the log\n"
"\titself in raw format, which you can achieve with\n"
"\t`--format=raw`.\n"
#: en/diff-options.txt:62
#, ignore-same, no-wrap
msgid "--patch-with-raw"
msgstr "--patch-with-raw"
#: en/diff-options.txt:64
msgid "Synonym for `-p --raw`."
msgid "--indent-heuristic"
msgstr "--indent-heuristic"
"Enable the heuristic that shifts diff hunk boundaries to make patches easier"
" to read. This is the default."
msgid "--no-indent-heuristic"
msgstr "--no-indent-heuristic"
#: en/diff-options.txt:72
msgid "Disable the indent heuristic."
msgstr "Désactive l'heuristique d'indentation."
msgid "--minimal"
msgstr "--minimal"
#: en/diff-options.txt:76 en/diff-options.txt:102
msgid "Spend extra time to make sure the smallest possible diff is produced."
#. type: Labeled list
msgid "--patience"
msgstr "--patience"
#: en/diff-options.txt:79
msgid "Generate a diff using the \"patience diff\" algorithm."
#. type: Labeled list
#: en/diff-options.txt:80
#, ignore-same, no-wrap
msgid "--histogram"
msgstr "--histogram"
#: en/diff-options.txt:82
msgid "Generate a diff using the \"histogram diff\" algorithm."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:85
msgid "Generate a diff using the \"anchored diff\" algorithm."
#. type: Plain text
#: en/diff-options.txt:87
msgid "This option may be specified more than once."
"If a line exists in both the source and destination, exists only once, and "
"starts with this text, this algorithm attempts to prevent it from appearing "
"as a deletion or addition in the output. It uses the \"patience diff\" "
"algorithm internally."
msgid "--diff-algorithm={patience|minimal|histogram|myers}"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:95
msgid "Choose a diff algorithm. The variants are as follows:"
#: en/diff-options.txt:99
msgid "The basic greedy diff algorithm. Currently, this is the default."
#. type: Labeled list
#: en/diff-options.txt:99
#, ignore-same, no-wrap
msgid "`minimal`"
msgstr "`minimal`"
#. type: Labeled list
#: en/diff-options.txt:102
#, ignore-same, no-wrap
msgid "`patience`"
msgstr "`patience`"
#: en/diff-options.txt:104
msgid "Use \"patience diff\" algorithm when generating patches."
#. type: Labeled list
#: en/diff-options.txt:104
#, ignore-same, no-wrap
msgid "`histogram`"
msgstr "`histogram`"
"This algorithm extends the patience algorithm to \"support low-occurrence "
"common elements\"."
#. type: Plain text
"For instance, if you configured the `diff.algorithm` variable to a non-"
"default value and want to use the default one, then you have to use `--diff-"
"algorithm=default` option."
msgid "--stat[=<width>[,<name-width>[,<count>]]]"
"Generate a diffstat. By default, as much space as necessary will be used for"
" the filename part, and the rest for the graph part. Maximum width defaults "
"to terminal width, or 80 columns if not connected to a terminal, and can be "
"overridden by `<width>`. The width of the filename part can be limited by "
"giving another width `<name-width>` after a comma. The width of the graph "
"part can be limited by using `--stat-graph-width=<width>` (affects all "
"commands generating a stat graph) or by setting "
"`diff.statGraphWidth=<width>` (does not affect `git format-patch`). By "
"giving a third parameter `<count>`, you can limit the output to the first "
"`<count>` lines, followed by `...` if there are more."
"These parameters can also be set individually with `--stat-width=<width>`, "
"`--stat-name-width=<name-width>` and `--stat-count=<count>`."
#. type: Labeled list
#: en/diff-options.txt:131
#, ignore-same, no-wrap
msgid "--compact-summary"
msgstr "--compact-summary"
"Output a condensed summary of extended header information such as file "
"creations or deletions (\"new\" or \"gone\", optionally \"+l\" if it's a "
"symlink) and mode changes (\"+x\" or \"-x\" for adding or removing "
"executable bit respectively) in diffstat. The information is put between the"
" filename part and the graph part. Implies `--stat`."
#: en/diff-options.txt:139 en/git-apply.txt:45
#, ignore-same, no-wrap
msgid "--numstat"
msgstr "--numstat"
"Similar to `--stat`, but shows number of added and deleted lines in decimal "
"notation and pathname without abbreviation, to make it more machine "
"friendly. For binary files, outputs two `-` instead of saying `0 0`."
msgid "--shortstat"
msgstr "--shortstat"
"Output only the last line of the `--stat` format containing total number of "
"modified files, as well as number of added and deleted lines."
msgid "--dirstat[=<param1,param2,...>]"
"Output the distribution of relative amount of changes for each sub-"
"directory. The behavior of `--dirstat` can be customized by passing it a "
"comma separated list of parameters. The defaults are controlled by the "
"`diff.dirstat` configuration variable (see linkgit:git-config[1]). The "
"following parameters are available:"
#. type: Labeled list
msgid "`changes`"
msgstr "`changes`"
#. type: Plain text
"Compute the dirstat numbers by counting the lines that have been removed "
"from the source, or added to the destination. This ignores the amount of "
"pure code movements within a file. In other words, rearranging lines in a "
"file is not counted as much as other changes. This is the default behavior "
"when no parameter is given."
#: en/diff-options.txt:166
#, ignore-same, no-wrap
msgid "`lines`"
msgstr "`lines`"
"Compute the dirstat numbers by doing the regular line-based diff analysis, "
"and summing the removed/added line counts. (For binary files, count 64-byte "
"chunks instead, since binary files have no natural concept of lines). This "
"is a more expensive `--dirstat` behavior than the `changes` behavior, but it"
" does count rearranged lines within a file as much as other changes. The "
"resulting output is consistent with what you get from the other `--*stat` "
"options."
#: en/diff-options.txt:174
#, ignore-same, no-wrap
msgid "`files`"
msgstr "`files`"
"Compute the dirstat numbers by counting the number of files changed. Each "
"changed file counts equally in the dirstat analysis. This is the "
"computationally cheapest `--dirstat` behavior, since it does not have to "
"look at the file contents at all."
msgid "`cumulative`"
msgstr "`cumulative`"
"Count changes in a child directory for the parent directory as well. Note "
"that when using `cumulative`, the sum of the percentages reported may exceed"
" 100%. The default (non-cumulative) behavior can be specified with the "
"`noncumulative` parameter."
#: en/diff-options.txt:184 en/git-cherry.txt:39
"An integer parameter specifies a cut-off percent (3% by default). "
"Directories contributing less than this percentage of the changes are not "
"shown in the output."
#: en/diff-options.txt:194
msgid ""
"Example: The following will count changed files, while ignoring directories "
"with less than 10% of the total amount of changed files, and accumulating "
"child directory counts in the parent directories: "
"`--dirstat=files,10,cumulative`."
#. type: Labeled list
#: en/diff-options.txt:195 en/git-apply.txt:52 en/git-shortlog.txt:35
#: en/merge-options.txt:115
msgid "--summary"
msgstr "--summary"
#. type: Plain text
#: en/diff-options.txt:198
msgid ""
"Output a condensed summary of extended header information such as creations,"
" renames and mode changes."
msgid "--patch-with-stat"
msgstr "--patch-with-stat"
#: en/diff-options.txt:202
msgid "Synonym for `-p --stat`."
#: en/diff-options.txt:206 en/git-apply.txt:115 en/git-check-attr.txt:34
#: en/git-check-ignore.txt:41 en/git-checkout-index.txt:67
#: en/git-commit.txt:122 en/git-config.txt:206 en/git-grep.txt:206
#: en/git-ls-files.txt:80 en/git-ls-tree.txt:55 en/git-mktree.txt:23
#: en/git-status.txt:122 en/git-update-index.txt:168
#: en/diff-options.txt:209
#, no-wrap
msgid "\tSeparate the commits with NULs instead of with new newlines.\n"
#: en/diff-options.txt:212
msgid ""
"Also, when `--raw` or `--numstat` has been given, do not munge pathnames and"
" use NULs as output field terminators."
#: en/diff-options.txt:216
#, no-wrap
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 ""
#: en/diff-options.txt:221 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 ""
#: en/diff-options.txt:222 en/git-config.txt:215 en/git-grep.txt:188
#: en/git-ls-tree.txt:59 en/git-name-rev.txt:51
msgid "--name-only"
msgstr "--name-only"
#: en/diff-options.txt:224
msgid "Show only names of changed files."
#: en/diff-options.txt:225 en/git-ls-tree.txt:60
msgid "--name-status"
msgstr "--name-status"
"Show only names and status of changed files. See the description of the "
"`--diff-filter` option on what the status letters mean."
msgid "--submodule[=<format>]"
msgstr ""
"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."
#. type: Labeled list
#: en/diff-options.txt:241 en/git-branch.txt:127 en/git-for-each-ref.txt:60
#: en/git-grep.txt:221 en/git-show-branch.txt:119 en/git-tag.txt:118
msgid "--color[=<when>]"
msgstr ""
"Show colored diff. `--color` (i.e. without '=<when>') is the same as "
"`--color=always`. '<when>' can be one of `always`, `never`, or `auto`."
#: en/diff-options.txt:248
#, no-wrap
"\tIt can be changed by the `color.ui` and `color.diff`\n"
"\tconfiguration settings.\n"
#. type: Labeled list
#: en/diff-options.txt:250 en/git-branch.txt:132 en/git-grep.txt:225
#: en/git-show-branch.txt:124
msgid "--no-color"
msgstr "--no-color"
#: en/diff-options.txt:252
msgid "Turn off colored diff."
#: en/diff-options.txt:254
#, no-wrap
msgid "\tThis can be used to override configuration settings.\n"
#: en/diff-options.txt:256
#, no-wrap
msgid "\tIt is the same as `--color=never`.\n"
#. type: Labeled list
msgstr "--color-moved[=<mode>]"
#: en/diff-options.txt:259
msgid "Moved lines of code are colored differently."
msgid "\tIt can be changed by the `diff.colorMoved` configuration setting.\n"
msgstr ""
#. type: Plain text
#: en/diff-options.txt:265
#, no-wrap
"\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"
#. type: Labeled list
#: en/diff-options.txt:267 en/diff-options.txt:309
#, no-wrap
msgid "no"
#: en/diff-options.txt:269
msgid "Moved lines are not highlighted."
#. type: Labeled list
#: en/diff-options.txt:269 en/git-commit.txt:211
#, no-wrap
msgid "default"
msgstr "default"
"Is a synonym for `zebra`. This may change to a more sensible mode in the "
"future."
msgstr ""
#. type: Labeled list
#: en/diff-options.txt:272 en/diff-options.txt:341
#, no-wrap
msgid "plain"
"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."
#. type: Labeled list
#: en/diff-options.txt:279
#, no-wrap
msgid "blocks"
"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."
#. type: Labeled list
#: en/diff-options.txt:284
#, no-wrap
msgid "zebra"
"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."
#. type: Labeled list
#: en/diff-options.txt:289
#, no-wrap
msgid "dimmed-zebra"
"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."
#. type: Labeled list
msgid "--no-color-moved"
msgstr "--no-color-moved"
"Turn off move detection. This can be used to override configuration "
"settings. It is the same as `--color-moved=no`."
#. type: Labeled list
msgstr "--color-moved-ws=<modes>"