{"thread":{"id":"54543","subject":"[PATCH] doc/diff-options: fix out of place mentions of '--patch/-p'","startedAt":"2020-10-31T19:37:57Z","lastAt":"2020-11-02T18:11:13Z","messageCount":2,"participants":["Sergey Organov","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"408794","messageId":"20201031193734.22702-1-sorganov@gmail.com","threadId":"54543","inReplyTo":null,"subject":"[PATCH] doc/diff-options: fix out of place mentions of '--patch/-p'","fromName":"Sergey Organov","fromEmail":"sorganov@gmail.com","sentAt":"2020-10-31T19:37:34Z","receivedAt":"2020-10-31T19:37:57Z","isPatch":true,"sender":{"key":"sorganov@gmail.com","avatar":"https://avatars.githubusercontent.com/u/8501568?v=4"},"body":"First, references to --patch and -p appeared in the description of\ngit-format-patch, where the options themselves are not included.\n\nNext, the description of --unified option elsewhere had duplicate implied\nstatements: \"Implies --patch. Implies -p.\"\n\nSigned-off-by: Sergey Organov <sorganov@gmail.com>\n---\n Documentation/diff-options.txt | 9 ++++++---\n 1 file changed, 6 insertions(+), 3 deletions(-)\n\ndiff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\nindex 573fb9bb71e2..320304033483 100644\n--- a/Documentation/diff-options.txt\n+++ b/Documentation/diff-options.txt\n@@ -36,9 +36,9 @@ endif::git-format-patch[]\n -U<n>::\n --unified=<n>::\n \tGenerate diffs with <n> lines of context instead of\n-\tthe usual three. Implies `--patch`.\n+\tthe usual three.\n ifndef::git-format-patch[]\n-\tImplies `-p`.\n+\tImplies `--patch`.\n endif::git-format-patch[]\n \n --output=<file>::\n@@ -441,7 +441,10 @@ endif::git-format-patch[]\n \n --binary::\n \tIn addition to `--full-index`, output a binary diff that\n-\tcan be applied with `git-apply`. Implies `--patch`.\n+\tcan be applied with `git-apply`.\n+ifndef::git-format-patch[]\n+\tImplies `--patch`.\n+endif::git-format-patch[]\n \n --abbrev[=<n>]::\n \tInstead of showing the full 40-byte hexadecimal object\n-- \n2.25.1\n\n"},{"id":"408871","messageId":"xmqq7dr3wrwm.fsf@gitster.c.googlers.com","threadId":"54543","inReplyTo":"20201031193734.22702-1-sorganov@gmail.com","subject":"Re: [PATCH] doc/diff-options: fix out of place mentions of '--patch/-p'","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2020-11-02T18:11:05Z","receivedAt":"2020-11-02T18:11:13Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Sergey Organov <sorganov@gmail.com> writes:\n\n> First, references to --patch and -p appeared in the description of\n> git-format-patch, where the options themselves are not included.\n\nFun.  The -U<n> option in \"git diff-index -U9\" implicitly turns\n\"--patch\" on, but it is hard to say that the same option in \"git\nformat-patch -U9\" turns \"--patch\" on, as it is in effect even\nwithout the -U<n> option.\n\nIt makes readers wonder what, if anything, needs to be done for \"git\ndiff -U9\", but let's leave it out of the scope of this change, which\nis strict improvement for \"format-patch\" documentation.\n\nThanks.\n\n> Next, the description of --unified option elsewhere had duplicate implied\n> statements: \"Implies --patch. Implies -p.\"\n>\n> Signed-off-by: Sergey Organov <sorganov@gmail.com>\n> ---\n>  Documentation/diff-options.txt | 9 ++++++---\n>  1 file changed, 6 insertions(+), 3 deletions(-)\n>\n> diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt\n> index 573fb9bb71e2..320304033483 100644\n> --- a/Documentation/diff-options.txt\n> +++ b/Documentation/diff-options.txt\n> @@ -36,9 +36,9 @@ endif::git-format-patch[]\n>  -U<n>::\n>  --unified=<n>::\n>  \tGenerate diffs with <n> lines of context instead of\n> -\tthe usual three. Implies `--patch`.\n> +\tthe usual three.\n>  ifndef::git-format-patch[]\n> -\tImplies `-p`.\n> +\tImplies `--patch`.\n>  endif::git-format-patch[]\n>  \n>  --output=<file>::\n> @@ -441,7 +441,10 @@ endif::git-format-patch[]\n>  \n>  --binary::\n>  \tIn addition to `--full-index`, output a binary diff that\n> -\tcan be applied with `git-apply`. Implies `--patch`.\n> +\tcan be applied with `git-apply`.\n> +ifndef::git-format-patch[]\n> +\tImplies `--patch`.\n> +endif::git-format-patch[]\n>  \n>  --abbrev[=<n>]::\n>  \tInstead of showing the full 40-byte hexadecimal object\n"}]}