| commit | 79296749161a422a103b6b13e4762600b94a87bc | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Apr 2016 21:12:35 +0000 (13 14:12 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 13 Apr 2016 21:12:35 +0000 (13 14:12 -0700) | ||
| tree | fae5f6ade41575bc9531b2cf32f87f4c076d12bc | treesnapshot (tar.gz zip) |
| parent | dd27384c36223dd2ef8f31d0edb5cb6d14a4f3f9 | commitdiff |
| parent | b73a1bcc1a9f9290bdc024c816d6c41b353c5eab | commitdiff |
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
"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 |