{"thread":{"id":"21513","subject":"[PATCH 2/4] format-patch documentation: Remove diff options that are not useful","startedAt":"2009-11-07T09:52:29Z","lastAt":"2009-11-07T16:55:16Z","messageCount":3,"participants":["Björn Gustavsson","Sebastian Pipping"],"isPatch":true,"patchVersion":1,"patchTotal":4},"messages":[{"id":"127034","messageId":"4AF5435D.9050702@gmail.com","threadId":"21513","inReplyTo":null,"subject":"[PATCH 2/4] format-patch documentation: Remove diff options that are not useful","fromName":"Björn Gustavsson","fromEmail":"bgustavsson@gmail.com","sentAt":"2009-11-07T09:52:29Z","receivedAt":"2009-11-07T09:52:29Z","isPatch":true,"sender":{"key":"bgustavsson@gmail.com","avatar":"https://avatars.githubusercontent.com/u/74840?v=4"},"body":"To simplify reading the documentation for format-patch, remove the\ndescription of common diff options that are not useful for the\npurpose of the command (i.e. \"Prepare patches for e-mail submission\").\n\nSpecifically, this removes the description of the following options:\n\n --raw\n -z\n --color\n --no-color\n --color-words\n --diff-filter\n -S\n --pickaxe-all\n --pickaxe-regex\n -R\n --relative\n --exit-code\n --quiet\n\nSigned-off-by: Björn Gustavsson \n---\n Documentation/diff-options.txt | 14 ++++++++++++--\n 1 files changed, 12 insertions(+), 2 deletions(-)\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex c58d085..a03f1a7 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -32,9 +32,11 @@ ifndef::git-format-patch[]\n \tImplies \"-p\".\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 --patch-with-raw::\n@@ -81,19 +83,18 @@ ifndef::git-format-patch[]\n \tSynonym for \"-p --stat\".\n endif::git-format-patch[]\n \n+ifndef::git-format-patch[]\n -z::\n \tNUL-line termination on output. This affects the --raw\n \toutput field terminator. Also output from commands such\n \tas \"git-log\" will be delimited with NUL between commits.\n \n-ifndef::git-format-patch[]\n --name-only::\n \tShow only names of changed files.\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-endif::git-format-patch[]\n \n --color::\n \tShow colored diff.\n@@ -118,6 +119,7 @@ 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+endif::git-format-patch[]\n \n --no-renames::\n \tTurn off rename detection, even when the configuration\n@@ -157,6 +159,7 @@ endif::git-format-patch[]\n -C::\n \tDetect copies as well as renames. See also `--find-copies-harder`.\n \n+ifndef::git-format-patch[]\n --diff-filter=[ACDMRTUXB*]::\n \tSelect only files that are Added (`A`), Copied (`C`),\n \tDeleted (`D`), Modified (`M`), Renamed (`R`), have their\n@@ -168,6 +171,7 @@ endif::git-format-patch[]\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 --find-copies-harder::\n \tFor performance reasons, by default, `-C` option finds copies only\n@@ -185,6 +189,7 @@ endif::git-format-patch[]\n \tthe number of rename/copy targets exceeds the specified\n \tnumber.\n \n+ifndef::git-format-patch[]\n -S::\n \tLook for differences that introduce or remove an instance of\n \t. Note that this is different than the string simply\n@@ -199,11 +204,13 @@ endif::git-format-patch[]\n --pickaxe-regex::\n \tMake the not a plain string but an extended POSIX\n \tregex to match.\n+endif::git-format-patch[]\n \n -O::\n \tOutput the patch in the order specified in the\n \t, 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@@ -215,6 +222,7 @@ endif::git-format-patch[]\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 as an argument.\n+endif::git-format-patch[]\n \n -a::\n --text::\n@@ -239,6 +247,7 @@ endif::git-format-patch[]\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@@ -246,6 +255,7 @@ endif::git-format-patch[]\n \n --quiet::\n \tDisable all output of the program. Implies --exit-code.\n+endif::git-format-patch[]\n \n --ext-diff::\n \tAllow an external diff helper to be executed. If you set an\n-- \n1.6.5.1.69.g36942\n"},{"id":"127048","messageId":"4AF5A605.9020008@hartwork.org","threadId":"21513","inReplyTo":"4AF5435D.9050702@gmail.com","subject":"Re: [PATCH 2/4] format-patch documentation: Remove diff options that are not useful","fromName":"Sebastian Pipping","fromEmail":"webmaster@hartwork.org","sentAt":"2009-11-07T16:53:25Z","receivedAt":"2009-11-07T16:53:25Z","isPatch":true,"sender":{"key":"webmaster@hartwork.org","avatar":null},"body":"Björn Gustavsson wrote:\n> To simplify reading the documentation for format-patch, remove the\n> description of common diff options that are not useful for the\n> purpose of the command (i.e. \"Prepare patches for e-mail submission\").\n> \n> Specifically, this removes the description of the following options:\n\n> --color-words\n\nI disagree on at least this one.\n\n\n\nSebastian\n"},{"id":"127049","messageId":"4AF5A674.2090900@hartwork.org","threadId":"21513","inReplyTo":"4AF5A605.9020008@hartwork.org","subject":"Re: [PATCH 2/4] format-patch documentation: Remove diff options that are not useful","fromName":"Sebastian Pipping","fromEmail":"webmaster@hartwork.org","sentAt":"2009-11-07T16:55:16Z","receivedAt":"2009-11-07T16:55:16Z","isPatch":true,"sender":{"key":"webmaster@hartwork.org","avatar":null},"body":"Sebastian Pipping wrote:\n> Björn Gustavsson wrote:\n>> To simplify reading the documentation for format-patch, remove the\n>> description of common diff options that are not useful for the\n>> purpose of the command (i.e. \"Prepare patches for e-mail submission\").\n>>\n>> Specifically, this removes the description of the following options:\n> \n>> --color-words\n> \n> I disagree on at least this one.\n\nNevermind, I mixed something up. Sorry.\n\n\n\nSebastian\n"}]}