Merge branch 'es/format-patch-doc-hide-no-patch' into maint
authorJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:06 +0000 (14:24 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 2 May 2016 21:24:06 +0000 (14:24 -0700)
"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

1  2 
Documentation/diff-options.txt
Simple merge