doc/diff-options: fix out of place mentions of '--patch/-p'
First, references to --patch and -p appeared in the description of git-format-patch, where the options themselves are not included. Next, the description of --unified option elsewhere had duplicate implied statements: "Implies --patch. Implies -p." Signed-off-by: Sergey Organov <sorganov@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Sergey Organov committed
Oct 31, 2020 at 22:37 UTC
714d491af0307782989bc3256d4aafa11d647729
1 file changed
+6
-3
Documentation/diff-options.txt
+6
-3
@@ -36,9 +36,9 @@ endif::git-format-patch[]
36
-U<n>::
37
--unified=<n>::
38
Generate diffs with <n> lines of context instead of
39
- the usual three. Implies `--patch`.
39
+ the usual three.
40
ifndef::git-format-patch[]
41
- Implies `-p`.
41
+ Implies `--patch`.
42
endif::git-format-patch[]
43
44
--output=<file>::
@@ -441,7 +441,10 @@ endif::git-format-patch[]
441
442
--binary::
443
In addition to `--full-index`, output a binary diff that
444
- can be applied with `git-apply`. Implies `--patch`.
444
+ can be applied with `git-apply`.
445
+ifndef::git-format-patch[]
446
+ Implies `--patch`.
447
+endif::git-format-patch[]
448
449
--abbrev[=<n>]::
450
Instead of showing the full 40-byte hexadecimal object