From: Eric Sunshine Date: Sun, 27 Mar 2016 21:26:07 +0000 (-0400) Subject: git-format-patch.txt: don't show -s as shorthand for multiple options X-Git-Tag: v2.8.3~41^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b73a1bcc1a9f9290bdc024c816d6c41b353c5eab;p=thirdparty%2Fgit.git git-format-patch.txt: don't show -s as shorthand for multiple options git-format-patch recognizes -s as shorthand only for --signoff, however, its documentation shows -s as shorthand for both --signoff and --no-patch. Resolve this confusion by suppressing the bogus -s shorthand for --no-patch. While here, also avoid showing the --no-patch option in git-format-patch documentation since it doesn't make sense to ask to suppress the patch while at the same time explicitly asking to format the patch (which, after all, is the purpose of git-format-patch). Reported-by: Kevin Brodsky Signed-off-by: Eric Sunshine Signed-off-by: Junio C Hamano --- diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 3ad6404dbc..9d0aea50cd 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -26,12 +26,12 @@ ifndef::git-format-patch[] ifdef::git-diff[] This is the default. endif::git-diff[] -endif::git-format-patch[] -s:: --no-patch:: Suppress diff output. Useful for commands like `git show` that show the patch by default, or to cancel the effect of `--patch`. +endif::git-format-patch[] -U:: --unified=::