From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 13 Apr 2016 21:12:35 +0000 (-0700)
Subject: Merge branch 'es/format-patch-doc-hide-no-patch'
X-Git-Tag: v2.9.0-rc0~125
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=79296749161a422a103b6b13e4762600b94a87bc;p=thirdparty%2Fgit.git

Merge branch 'es/format-patch-doc-hide-no-patch'

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

79296749161a422a103b6b13e4762600b94a87bc