summaryrefslogtreecommitdiff
path: root/Documentation/diff-options.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-02 21:24:06 (GMT)
committerJunio C Hamano <gitster@pobox.com>2016-05-02 21:24:06 (GMT)
commita3fa5653276ed923ef079188459242f3f7e6264d (patch)
tree90b3a7633ef323acd739dc9f1fae5be72e22e5b8 /Documentation/diff-options.txt
parent3c383a30c854232b2a678110dd191b639a8b7989 (diff)
parentb73a1bcc1a9f9290bdc024c816d6c41b353c5eab (diff)
downloadgit-a3fa5653276ed923ef079188459242f3f7e6264d.zip
git-a3fa5653276ed923ef079188459242f3f7e6264d.tar.gz
git-a3fa5653276ed923ef079188459242f3f7e6264d.tar.bz2
Merge branch 'es/format-patch-doc-hide-no-patch' into maint
"git format-patch --help" showed `-s` and `--no-patch` as if these are valid options to the command. We already hide `--patch` option from the documentation, because format-patch is about showing the diff, and the documentation now hides these options as well. * es/format-patch-doc-hide-no-patch: git-format-patch.txt: don't show -s as shorthand for multiple options
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 32f48ed..4b0318e 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>::