diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-11 13:18:37 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 13:18:37 -0800 |
| commit | c5a802f0ce46c34232cd85ae51d6f5d1cd5a574b (patch) | |
| tree | fb26e8d35088c82eed83a12573cadccf2f30d136 /Documentation | |
| parent | Fourth batch (diff) | |
| parent | doc/diff-options: fix out of place mentions of '--patch/-p' (diff) | |
| download | tgif-c5a802f0ce46c34232cd85ae51d6f5d1cd5a574b.tar.xz | |
Merge branch 'so/format-patch-doc-on-default-diff-format'
Docfix.
* so/format-patch-doc-on-default-diff-format:
doc/diff-options: fix out of place mentions of '--patch/-p'
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/diff-options.txt | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index ee52b65e46..c7f1f2f0ac 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -36,9 +36,9 @@ endif::git-format-patch[] -U<n>:: --unified=<n>:: Generate diffs with <n> lines of context instead of - the usual three. Implies `--patch`. + the usual three. ifndef::git-format-patch[] - Implies `-p`. + Implies `--patch`. endif::git-format-patch[] --output=<file>:: @@ -441,7 +441,10 @@ endif::git-format-patch[] --binary:: In addition to `--full-index`, output a binary diff that - can be applied with `git-apply`. Implies `--patch`. + can be applied with `git-apply`. +ifndef::git-format-patch[] + Implies `--patch`. +endif::git-format-patch[] --abbrev[=<n>]:: Instead of showing the full 40-byte hexadecimal object |