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 <corax26@gmail.com> Signed-off-by: Eric Sunshine <sunshine@sunshineco.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Eric Sunshine committed
Mar 27, 2016 at 17:26 UTC
b73a1bcc1a9f9290bdc024c816d6c41b353c5eab
1 file changed
+1
-1
Documentation/diff-options.txt
+1
-1
@@ -26,12 +26,12 @@ ifndef::git-format-patch[]
26
ifdef::git-diff[]
27
This is the default.
28
endif::git-diff[]
29
-endif::git-format-patch[]
29
30
-s::
31
--no-patch::
32
Suppress diff output. Useful for commands like `git show` that
33
show the patch by default, or to cancel the effect of `--patch`.
34
+endif::git-format-patch[]
35
36
-U<n>::
37
--unified=<n>::