| commit | a3fa5653276ed923ef079188459242f3f7e6264d | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 May 2016 21:24:06 +0000 (2 14:24 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 2 May 2016 21:24:06 +0000 (2 14:24 -0700) | ||
| tree | 90b3a7633ef323acd739dc9f1fae5be72e22e5b8 | treesnapshot (tar.gz zip) |
| parent | 3c383a30c854232b2a678110dd191b639a8b7989 | commitdiff |
| parent | b73a1bcc1a9f9290bdc024c816d6c41b353c5eab | commitdiff |
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
"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 | blobhistory |