diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:35 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-13 14:12:35 -0700 |
| commit | 79296749161a422a103b6b13e4762600b94a87bc (patch) | |
| tree | fae5f6ade41575bc9531b2cf32f87f4c076d12bc /Documentation | |
| parent | dd27384c36223dd2ef8f31d0edb5cb6d14a4f3f9 (diff) | |
| parent | b73a1bcc1a9f9290bdc024c816d6c41b353c5eab (diff) | |
| download | git-79296749161a422a103b6b13e4762600b94a87bc.tar.gz git-79296749161a422a103b6b13e4762600b94a87bc.tar.xz | |
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
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 32f48ed64..4b0318e2a 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -26,12 +26,12 @@ ifndef::git-format-patch[] ifdef::git-diff[] This is the default. endif::git-diff[] -endif::git-format-patch[] -s:: --no-patch:: Suppress diff output. Useful for commands like `git show` that show the patch by default, or to cancel the effect of `--patch`. +endif::git-format-patch[] -U<n>:: --unified=<n>:: |