{"thread":{"id":"25898","subject":"[PATCH] diff-options.txt: order options alphabetically","startedAt":"2010-12-01T19:20:22Z","lastAt":"2010-12-01T19:20:22Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"156987","messageId":"1291231222-19015-1-git-send-email-jari.aalto@cante.net","threadId":"25898","inReplyTo":null,"subject":"[PATCH] diff-options.txt: order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T19:20:22Z","receivedAt":"2010-12-01T19:20:22Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"From: Jari Aalto <jari.aalto@cante.net>\n\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/diff-options.txt |  565 +++++++++++++++++++++-------------------\n 1 files changed, 295 insertions(+), 270 deletions(-)\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex f3e9538..a3eb7d3 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -12,47 +12,203 @@ endif::git-log[]\n endif::git-diff[]\n endif::git-format-patch[]\n \n-ifdef::git-format-patch[]\n--p::\n---no-stat::\n-\tGenerate plain patches without any diffstats.\n+-a::\n+--text::\n+\tTreat all files as text.\n+\n+--abbrev[=<n>]::\n+\tInstead of showing the full 40-byte hexadecimal object\n+\tname in diff-raw format output and diff-tree header\n+\tlines, show only a partial prefix.  This is\n+\tindependent of the `--full-index` option above, which controls\n+\tthe diff-patch output format.  Non default number of\n+\tdigits can be specified with `--abbrev=<n>`.\n+\n+-b::\n+--ignore-space-change::\n+\tIgnore changes in amount of whitespace.  This ignores whitespace\n+\tat line end, and considers all other sequences of one or\n+\tmore whitespace characters to be equivalent.\n+\n+-B[<n>][/<m>]::\n+--break-rewrites[=[<n>][/<m>]]::\n+\tBreak complete rewrite changes into pairs of delete and\n+\tcreate. This serves two purposes:\n++\n+It affects the way a change that amounts to a total rewrite of a file\n+not as a series of deletion and insertion mixed together with a very\n+few lines that happen to match textually as the context, but as a\n+single deletion of everything old followed by a single insertion of\n+everything new, and the number `m` controls this aspect of the -B\n+option (defaults to 60%). `-B/70%` specifies that less than 30% of the\n+original should remain in the result for git to consider it a total\n+rewrite (i.e. otherwise the resulting patch will be a series of\n+deletion and insertion mixed together with context lines).\n++\n+When used with -M, a totally-rewritten file is also considered as the\n+source of a rename (usually -M only considers a file that disappeared\n+as the source of a rename), and the number `n` controls this aspect of\n+the -B option (defaults to 50%). `-B20%` specifies that a change with\n+addition and deletion compared to 20% or more of the file's size are\n+eligible for being picked up as a possible source of a rename to\n+another file.\n+\n+--binary::\n+\tIn addition to `--full-index`, output a binary diff that\n+\tcan be applied with `git-apply`.\n+\n+-C[<n>]::\n+--detect-copies[=<n>]::\n+\tDetect copies as well as renames.  See also `--find-copies-harder`.\n+\tIf `n` is specified, it has the same meaning as for `-M<n>`.\n+\n+ifndef::git-format-patch[]\n+--check::\n+\tWarn if changes introduce trailing whitespace\n+\tor an indent that uses a space before a tab. Exits with\n+\tnon-zero status if problems are found. Not compatible with\n+\t--exit-code.\n endif::git-format-patch[]\n \n ifndef::git-format-patch[]\n--p::\n--u::\n---patch::\n-\tGenerate patch (see section on generating patches).\n-\t{git-diff? This is the default.}\n+--color[=<when>]::\n+--no-color::\n+\tShow colored diff.\n+\tThe value must be always (the default), never, or auto.\n+\n+\tOr turn off colored diff, even when the configuration file\n+\tgives the default to color output.\n+\tSame as `--color=never`.\n endif::git-format-patch[]\n \n--U<n>::\n---unified=<n>::\n-\tGenerate diffs with <n> lines of context instead of\n-\tthe usual three.\n ifndef::git-format-patch[]\n-\tImplies `-p`.\n+--color-words[=<regex>]::\n+\tEquivalent to `--word-diff=color` plus (if a regex was\n+\tspecified) `--word-diff-regex=<regex>`.\n endif::git-format-patch[]\n \n ifndef::git-format-patch[]\n---raw::\n-\tGenerate the raw format.\n-\t{git-diff-core? This is the default.}\n+--diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::\n+\tSelect only files that are Added (`A`), Copied (`C`),\n+\tDeleted (`D`), Modified (`M`), Renamed (`R`), have their\n+\ttype (i.e. regular file, symlink, submodule, ...) changed (`T`),\n+\tare Unmerged (`U`), are\n+\tUnknown (`X`), or have had their pairing Broken (`B`).\n+\tAny combination of the filter characters (including none) can be used.\n+\tWhen `*` (All-or-none) is added to the combination, all\n+\tpaths are selected if there is any file that matches\n+\tother criteria in the comparison; if there is no file\n+\tthat matches other criteria, nothing is selected.\n endif::git-format-patch[]\n \n+--dirstat[=<limit>]::\n+\tOutput the distribution of relative amount of changes (number of lines added or\n+\tremoved) for each sub-directory. Directories with changes below\n+\ta cut-off percent (3% by default) are not shown. The cut-off percent\n+\tcan be set with `--dirstat=<limit>`. Changes in a child directory are not\n+\tcounted for the parent directory, unless `--cumulative` is used.\n+\n+--dirstat-by-file[=<limit>]::\n+\tSame as `--dirstat`, but counts changed files instead of lines.\n+\n+--dst-prefix=<prefix>::\n+\tShow the given destination prefix instead of \"b/\".\n+\n ifndef::git-format-patch[]\n---patch-with-raw::\n-\tSynonym for `-p --raw`.\n+--exit-code::\n+\tMake the program exit with codes similar to diff(1).\n+\tThat is, it exits with 1 if there were differences and\n+\t0 means no differences.\n endif::git-format-patch[]\n \n---patience::\n-\tGenerate a diff using the \"patience diff\" algorithm.\n+--ext-diff::\n+\tAllow an external diff helper to be executed. If you set an\n+\texternal diff driver with linkgit:gitattributes[5], you need\n+\tto use this option with linkgit:git-log[1] and friends.\n \n---stat[=<width>[,<name-width>]]::\n-\tGenerate a diffstat.  You can override the default\n-\toutput width for 80-column terminal by `--stat=<width>`.\n-\tThe width of the filename part can be controlled by\n-\tgiving another width to it separated by a comma.\n+--find-copies-harder::\n+\tFor performance reasons, by default, `-C` option finds copies only\n+\tif the original file of the copy was modified in the same\n+\tchangeset.  This flag makes the command\n+\tinspect unmodified files as candidates for the source of\n+\tcopy.  This is a very expensive operation for large\n+\tprojects, so use it with caution.  Giving more than one\n+\t`-C` option has the same effect.\n+\n+--full-index::\n+\tInstead of the first handful of characters, show the full\n+\tpre- and post-image blob object names on the \"index\"\n+\tline when generating patch format output.\n+\n+ifndef::git-format-patch[]\n+-G<regex>::\n+\tLook for differences whose added or removed line matches\n+\tthe given <regex>.\n+endif::git-format-patch[]\n+\n+--ignore-space-at-eol::\n+\tIgnore changes in whitespace at EOL.\n+\n+--ignore-submodules[=<when>]::\n+\tIgnore changes to submodules in the diff generation. <when> can be\n+\teither \"none\", \"untracked\", \"dirty\" or \"all\", which is the default\n+\tUsing \"none\" will consider the submodule modified when it either contains\n+\tuntracked or modified files or its HEAD differs from the commit recorded\n+\tin the superproject and can be used to override any settings of the\n+\t'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When\n+\t\"untracked\" is used submodules are not considered dirty when they only\n+\tcontain untracked content (but they are still scanned for modified\n+\tcontent). Using \"dirty\" ignores all changes to the work tree of submodules,\n+\tonly changes to the commits stored in the superproject are shown (this was\n+\tthe behavior until 1.7.0). Using \"all\" hides all changes to submodules.\n+\n+--inter-hunk-context=<lines>::\n+\tShow the context between diff hunks, up to the specified number\n+\tof lines, thereby fusing hunks that are close to each other.\n+\n+-l<num>::\n+\tThe `-M` and `-C` options require O(n^2) processing time where n\n+\tis the number of potential rename/copy targets.  This\n+\toption prevents rename/copy detection from running if\n+\tthe number of rename/copy targets exceeds the specified\n+\tnumber.\n+\n+-M[<n>]::\n+--detect-renames[=<n>]::\n+ifndef::git-log[]\n+\tDetect renames.\n+endif::git-log[]\n+ifdef::git-log[]\n+\tIf generating diffs, detect and report renames for each commit.\n+\tFor following files across renames while traversing history, see\n+\t`--follow`.\n+endif::git-log[]\n+\tIf `n` is specified, it is a 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.\n+\n+ifndef::git-format-patch[]\n+--name-only::\n+\tShow only names of changed files.\n+endif::git-format-patch[]\n+\n+ifndef::git-format-patch[]\n+--name-status::\n+\tShow only names and status of changed files. See the description\n+\tof the `--diff-filter` option on what the status letters mean.\n+endif::git-format-patch[]\n+\n+--no-ext-diff::\n+\tDisallow external diff drivers.\n+\n+--no-prefix::\n+\tDo not show any source or destination prefix.\n+\n+--no-renames::\n+\tTurn off rename detection, even when the configuration\n+\tfile gives the default to do so.\n \n --numstat::\n \tSimilar to `\\--stat`, but shows number of added and\n@@ -61,72 +217,127 @@ endif::git-format-patch[]\n \tbinary files, outputs two `-` instead of saying\n \t`0 0`.\n \n---shortstat::\n-\tOutput only the last line of the `--stat` format containing total\n-\tnumber of modified files, as well as number of added and deleted\n-\tlines.\n+-O<orderfile>::\n+\tOutput the patch in the order specified in the\n+\t<orderfile>, which has one shell glob pattern per line.\n \n---dirstat[=<limit>]::\n-\tOutput the distribution of relative amount of changes (number of lines added or\n-\tremoved) for each sub-directory. Directories with changes below\n-\ta cut-off percent (3% by default) are not shown. The cut-off percent\n-\tcan be set with `--dirstat=<limit>`. Changes in a child directory are not\n-\tcounted for the parent directory, unless `--cumulative` is used.\n+ifndef::git-format-patch[]\n+-p::\n+-u::\n+--patch::\n+\tGenerate patch (see section on generating patches).\n+\t{git-diff? This is the default.}\n+endif::git-format-patch[]\n \n---dirstat-by-file[=<limit>]::\n-\tSame as `--dirstat`, but counts changed files instead of lines.\n+ifdef::git-format-patch[]\n+-p::\n+--no-stat::\n+\tGenerate plain patches without any diffstats.\n+endif::git-format-patch[]\n \n---summary::\n-\tOutput a condensed summary of extended header information\n-\tsuch as creations, renames and mode changes.\n+ifndef::git-format-patch[]\n+--patch-with-raw::\n+\tSynonym for `-p --raw`.\n+endif::git-format-patch[]\n \n ifndef::git-format-patch[]\n --patch-with-stat::\n \tSynonym for `-p --stat`.\n endif::git-format-patch[]\n \n+--patience::\n+\tGenerate a diff using the \"patience diff\" algorithm.\n+\n ifndef::git-format-patch[]\n+--pickaxe-all::\n+\tWhen `-S` or `-G` finds a change, show all the changes in that\n+\tchangeset, not just the files that contain the change\n+\tin <string>.\n+endif::git-format-patch[]\n \n--z::\n-ifdef::git-log[]\n-\tSeparate the commits with NULs instead of with new newlines.\n-+\n-Also, when `--raw` or `--numstat` has been given, do not munge\n-pathnames and use NULs as output field terminators.\n-endif::git-log[]\n-ifndef::git-log[]\n-\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n-\tgiven, do not munge pathnames and use NULs as output field terminators.\n-endif::git-log[]\n-+\n-Without this option, each pathname output will have TAB, LF, double quotes,\n-and backslash characters replaced with `\\t`, `\\n`, `\\\"`, and `\\\\`,\n-respectively, and the pathname will be enclosed in double quotes if\n-any of those replacements occurred.\n+ifndef::git-format-patch[]\n+--pickaxe-regex::\n+\tMake the <string> not a plain string but an extended POSIX\n+\tregex to match.\n+endif::git-format-patch[]\n+\n+ifndef::git-format-patch[]\n+--quiet::\n+\tDisable all output of the program. Implies `--exit-code`.\n+endif::git-format-patch[]\n+\n+ifndef::git-format-patch[]\n+-R::\n+\tSwap two inputs; that is, show differences from index or\n+\ton-disk file to tree contents.\n+endif::git-format-patch[]\n+\n+ifndef::git-format-patch[]\n+--raw::\n+\tGenerate the raw format.\n+\t{git-diff-core? This is the default.}\n+endif::git-format-patch[]\n+\n+ifndef::git-format-patch[]\n+--relative[=<path>]::\n+\tWhen run from a subdirectory of the project, it can be\n+\ttold to exclude changes outside the directory and show\n+\tpathnames relative to it with this option.  When you are\n+\tnot in a subdirectory (e.g. in a bare repository), you\n+\tcan name which subdirectory to make the output relative\n+\tto by giving a <path> as an argument.\n+endif::git-format-patch[]\n+\n+ifndef::git-format-patch[]\n+-S<string>::\n+\tLook for differences that introduce or remove an instance of\n+\t<string>. Note that this is different than the string simply\n+\tappearing in diff output; see the 'pickaxe' entry in\n+\tlinkgit:gitdiffcore[7] for more details.\n+endif::git-format-patch[]\n+\n+--stat[=<width>[,<name-width>]]::\n+\tGenerate a diffstat.  You can override the default\n+\toutput width for 80-column terminal by `--stat=<width>`.\n+\tThe width of the filename part can be controlled by\n+\tgiving another width to it separated by a comma.\n \n---name-only::\n-\tShow only names of changed files.\n+--shortstat::\n+\tOutput only the last line of the `--stat` format containing total\n+\tnumber of modified files, as well as number of added and deleted\n+\tlines.\n \n---name-status::\n-\tShow only names and status of changed files. See the description\n-\tof the `--diff-filter` option on what the status letters mean.\n+--src-prefix=<prefix>::\n+\tShow the given source prefix instead of \"a/\".\n \n+ifndef::git-format-patch[]\n --submodule[=<format>]::\n \tChose the output format for submodule differences. <format> can be one of\n \t'short' and 'log'. 'short' just shows pairs of commit names, this format\n \tis used when this option is not given. 'log' is the default value for this\n \toption and lists the commits in that commit range like the 'summary'\n \toption of linkgit:git-submodule[1] does.\n+endif::git-format-patch[]\n \n---color[=<when>]::\n-\tShow colored diff.\n-\tThe value must be always (the default), never, or auto.\n+--summary::\n+\tOutput a condensed summary of extended header information\n+\tsuch as creations, renames and mode changes.\n \n---no-color::\n-\tTurn off colored diff, even when the configuration file\n-\tgives the default to color output.\n-\tSame as `--color=never`.\n+-U<n>::\n+--unified=<n>::\n+\tGenerate diffs with <n> lines of context instead of\n+\tthe usual three.\n+ifndef::git-format-patch[]\n+\tImplies `-p`.\n+endif::git-format-patch[]\n+\n+-w::\n+--ignore-all-space::\n+\tIgnore whitespace when comparing lines.  This ignores\n+\tdifferences even if one line has whitespace where the other\n+\tline has none.\n \n+ifndef::git-format-patch[]\n --word-diff[=<mode>]::\n \tShow a word diff, using the <mode> to delimit changed words.\n \tBy default, words are delimited by whitespace; see\n@@ -153,7 +364,9 @@ none::\n +\n Note that despite the name of the first mode, color is used to\n highlight the changed parts in all modes if enabled.\n+endif::git-format-patch[]\n \n+ifndef::git-format-patch[]\n --word-diff-regex=<regex>::\n \tUse <regex> to decide what a word is, instead of considering\n \truns of non-whitespace to be a word.  Also implies\n@@ -171,214 +384,26 @@ The regex can also be set via a diff driver or configuration option, see\n linkgit:gitattributes[1] or linkgit:git-config[1].  Giving it explicitly\n overrides any diff driver or configuration setting.  Diff drivers\n override configuration settings.\n-\n---color-words[=<regex>]::\n-\tEquivalent to `--word-diff=color` plus (if a regex was\n-\tspecified) `--word-diff-regex=<regex>`.\n endif::git-format-patch[]\n \n---no-renames::\n-\tTurn off rename detection, even when the configuration\n-\tfile gives the default to do so.\n-\n ifndef::git-format-patch[]\n---check::\n-\tWarn if changes introduce trailing whitespace\n-\tor an indent that uses a space before a tab. Exits with\n-\tnon-zero status if problems are found. Not compatible with\n-\t--exit-code.\n-endif::git-format-patch[]\n-\n---full-index::\n-\tInstead of the first handful of characters, show the full\n-\tpre- and post-image blob object names on the \"index\"\n-\tline when generating patch format output.\n-\n---binary::\n-\tIn addition to `--full-index`, output a binary diff that\n-\tcan be applied with `git-apply`.\n-\n---abbrev[=<n>]::\n-\tInstead of showing the full 40-byte hexadecimal object\n-\tname in diff-raw format output and diff-tree header\n-\tlines, show only a partial prefix.  This is\n-\tindependent of the `--full-index` option above, which controls\n-\tthe diff-patch output format.  Non default number of\n-\tdigits can be specified with `--abbrev=<n>`.\n-\n--B[<n>][/<m>]::\n---break-rewrites[=[<n>][/<m>]]::\n-\tBreak complete rewrite changes into pairs of delete and\n-\tcreate. This serves two purposes:\n-+\n-It affects the way a change that amounts to a total rewrite of a file\n-not as a series of deletion and insertion mixed together with a very\n-few lines that happen to match textually as the context, but as a\n-single deletion of everything old followed by a single insertion of\n-everything new, and the number `m` controls this aspect of the -B\n-option (defaults to 60%). `-B/70%` specifies that less than 30% of the\n-original should remain in the result for git to consider it a total\n-rewrite (i.e. otherwise the resulting patch will be a series of\n-deletion and insertion mixed together with context lines).\n+-z::\n+ifdef::git-log[]\n+\tSeparate the commits with NULs instead of with new newlines.\n +\n-When used with -M, a totally-rewritten file is also considered as the\n-source of a rename (usually -M only considers a file that disappeared\n-as the source of a rename), and the number `n` controls this aspect of\n-the -B option (defaults to 50%). `-B20%` specifies that a change with\n-addition and deletion compared to 20% or more of the file's size are\n-eligible for being picked up as a possible source of a rename to\n-another file.\n-\n--M[<n>]::\n---detect-renames[=<n>]::\n-ifndef::git-log[]\n-\tDetect renames.\n+Also, when `--raw` or `--numstat` has been given, do not munge\n+pathnames and use NULs as output field terminators.\n endif::git-log[]\n-ifdef::git-log[]\n-\tIf generating diffs, detect and report renames for each commit.\n-\tFor following files across renames while traversing history, see\n-\t`--follow`.\n+ifndef::git-log[]\n+\tWhen `--raw`, `--numstat`, `--name-only` or `--name-status` has been\n+\tgiven, do not munge pathnames and use NULs as output field terminators.\n endif::git-log[]\n-\tIf `n` is specified, it is a 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.\n-\n--C[<n>]::\n---detect-copies[=<n>]::\n-\tDetect copies as well as renames.  See also `--find-copies-harder`.\n-\tIf `n` is specified, it has the same meaning as for `-M<n>`.\n-\n---find-copies-harder::\n-\tFor performance reasons, by default, `-C` option finds copies only\n-\tif the original file of the copy was modified in the same\n-\tchangeset.  This flag makes the command\n-\tinspect unmodified files as candidates for the source of\n-\tcopy.  This is a very expensive operation for large\n-\tprojects, so use it with caution.  Giving more than one\n-\t`-C` option has the same effect.\n-\n--l<num>::\n-\tThe `-M` and `-C` options require O(n^2) processing time where n\n-\tis the number of potential rename/copy targets.  This\n-\toption prevents rename/copy detection from running if\n-\tthe number of rename/copy targets exceeds the specified\n-\tnumber.\n-\n-ifndef::git-format-patch[]\n---diff-filter=[(A|C|D|M|R|T|U|X|B)...[*]]::\n-\tSelect only files that are Added (`A`), Copied (`C`),\n-\tDeleted (`D`), Modified (`M`), Renamed (`R`), have their\n-\ttype (i.e. regular file, symlink, submodule, ...) changed (`T`),\n-\tare Unmerged (`U`), are\n-\tUnknown (`X`), or have had their pairing Broken (`B`).\n-\tAny combination of the filter characters (including none) can be used.\n-\tWhen `*` (All-or-none) is added to the combination, all\n-\tpaths are selected if there is any file that matches\n-\tother criteria in the comparison; if there is no file\n-\tthat matches other criteria, nothing is selected.\n-\n--S<string>::\n-\tLook for differences that introduce or remove an instance of\n-\t<string>. Note that this is different than the string simply\n-\tappearing in diff output; see the 'pickaxe' entry in\n-\tlinkgit:gitdiffcore[7] for more details.\n-\n--G<regex>::\n-\tLook for differences whose added or removed line matches\n-\tthe given <regex>.\n-\n---pickaxe-all::\n-\tWhen `-S` or `-G` finds a change, show all the changes in that\n-\tchangeset, not just the files that contain the change\n-\tin <string>.\n-\n---pickaxe-regex::\n-\tMake the <string> not a plain string but an extended POSIX\n-\tregex to match.\n-endif::git-format-patch[]\n-\n--O<orderfile>::\n-\tOutput the patch in the order specified in the\n-\t<orderfile>, which has one shell glob pattern per line.\n-\n-ifndef::git-format-patch[]\n--R::\n-\tSwap two inputs; that is, show differences from index or\n-\ton-disk file to tree contents.\n-\n---relative[=<path>]::\n-\tWhen run from a subdirectory of the project, it can be\n-\ttold to exclude changes outside the directory and show\n-\tpathnames relative to it with this option.  When you are\n-\tnot in a subdirectory (e.g. in a bare repository), you\n-\tcan name which subdirectory to make the output relative\n-\tto by giving a <path> as an argument.\n-endif::git-format-patch[]\n-\n--a::\n---text::\n-\tTreat all files as text.\n-\n---ignore-space-at-eol::\n-\tIgnore changes in whitespace at EOL.\n-\n--b::\n---ignore-space-change::\n-\tIgnore changes in amount of whitespace.  This ignores whitespace\n-\tat line end, and considers all other sequences of one or\n-\tmore whitespace characters to be equivalent.\n-\n--w::\n---ignore-all-space::\n-\tIgnore whitespace when comparing lines.  This ignores\n-\tdifferences even if one line has whitespace where the other\n-\tline has none.\n-\n---inter-hunk-context=<lines>::\n-\tShow the context between diff hunks, up to the specified number\n-\tof lines, thereby fusing hunks that are close to each other.\n-\n-ifndef::git-format-patch[]\n---exit-code::\n-\tMake the program exit with codes similar to diff(1).\n-\tThat is, it exits with 1 if there were differences and\n-\t0 means no differences.\n-\n---quiet::\n-\tDisable all output of the program. Implies `--exit-code`.\n++\n+Without this option, each pathname output will have TAB, LF, double quotes,\n+and backslash characters replaced with `\\t`, `\\n`, `\\\"`, and `\\\\`,\n+respectively, and the pathname will be enclosed in double quotes if\n+any of those replacements occurred.\n endif::git-format-patch[]\n \n---ext-diff::\n-\tAllow an external diff helper to be executed. If you set an\n-\texternal diff driver with linkgit:gitattributes[5], you need\n-\tto use this option with linkgit:git-log[1] and friends.\n-\n---no-ext-diff::\n-\tDisallow external diff drivers.\n-\n---ignore-submodules[=<when>]::\n-\tIgnore changes to submodules in the diff generation. <when> can be\n-\teither \"none\", \"untracked\", \"dirty\" or \"all\", which is the default\n-\tUsing \"none\" will consider the submodule modified when it either contains\n-\tuntracked or modified files or its HEAD differs from the commit recorded\n-\tin the superproject and can be used to override any settings of the\n-\t'ignore' option in linkgit:git-config[1] or linkgit:gitmodules[5]. When\n-\t\"untracked\" is used submodules are not considered dirty when they only\n-\tcontain untracked content (but they are still scanned for modified\n-\tcontent). Using \"dirty\" ignores all changes to the work tree of submodules,\n-\tonly changes to the commits stored in the superproject are shown (this was\n-\tthe behavior until 1.7.0). Using \"all\" hides all changes to submodules.\n-\n---src-prefix=<prefix>::\n-\tShow the given source prefix instead of \"a/\".\n-\n---dst-prefix=<prefix>::\n-\tShow the given destination prefix instead of \"b/\".\n-\n---no-prefix::\n-\tDo not show any source or destination prefix.\n-\n For more detailed explanation on these common options, see also\n linkgit:gitdiffcore[7].\n-- \n1.7.2.3\n"}]}