summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorEric Sunshine <sunshine@sunshineco.com>2016-03-27 21:26:07 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-04-04 20:46:54 (GMT)
commitb73a1bcc1a9f9290bdc024c816d6c41b353c5eab (patch)
treed40128488c748cd5d439d5b9bc115348869d5b8d /Documentation/diff-options.txt
parent765428699a5381f113d19974720bc91b5bfeaf1d (diff)
downloadgit-b73a1bcc1a9f9290bdc024c816d6c41b353c5eab.zip
git-b73a1bcc1a9f9290bdc024c816d6c41b353c5eab.tar.gz
git-b73a1bcc1a9f9290bdc024c816d6c41b353c5eab.tar.bz2
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>
Diffstat (limited to 'Documentation/diff-options.txt')
-rw-r--r--Documentation/diff-options.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt
index 3ad6404..9d0aea5 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<n>::
--unified=<n>::