]> granicus.if.org Git - git/commit
projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3c383a3 b73a1bc)
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)
commita3fa5653276ed923ef079188459242f3f7e6264d
tree90b3a7633ef323acd739dc9f1fae5be72e22e5b8tree | snapshot
parent3c383a30c854232b2a678110dd191b639a8b7989commit | diff
parentb73a1bcc1a9f9290bdc024c816d6c41b353c5eabcommit | diff
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
Documentation/diff-options.txt diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.