{"thread":{"id":"21353","subject":"[PATCH 2/3] format-patch documentation: Remove diff options that are not useful","startedAt":"2009-10-25T15:56:15Z","lastAt":"2009-10-25T15:56:15Z","messageCount":1,"participants":["Björn Gustavsson"],"isPatch":true,"patchVersion":1,"patchTotal":3},"messages":[{"id":"125896","messageId":"4AE4751F.9060300@gmail.com","threadId":"21353","inReplyTo":null,"subject":"[PATCH 2/3] format-patch documentation: Remove diff options that are not useful","fromName":"Björn Gustavsson","fromEmail":"bgustavsson@gmail.com","sentAt":"2009-10-25T15:56:15Z","receivedAt":"2009-10-25T15:56:15Z","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\nRemove 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---\n Documentation/diff-options.txt |   15 ++++++++++++---\n 1 files changed, 12 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 673fbb0..88e88d7 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -27,9 +27,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@@ -76,20 +78,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 \n@@ -113,6 +113,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@@ -152,6 +153,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@@ -163,6 +165,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@@ -180,6 +183,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<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@@ -194,11 +198,13 @@ endif::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 -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@@ -210,6 +216,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 <path> as an argument.\n+endif::git-format-patch[]\n \n -a::\n --text::\n@@ -234,6 +241,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@@ -241,6 +249,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"}]}