From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 2 May 2016 21:24:06 +0000 (-0700)
Subject: Merge branch 'es/format-patch-doc-hide-no-patch' into maint
X-Git-Tag: v2.8.3~41
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/a3fa5653276ed923ef079188459242f3f7e6264d

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
---

a3fa5653276ed923ef079188459242f3f7e6264d