mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-27 06:26:13 +02:00
Code

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>
This commit is contained in:
Sergey Organov 2020-10-31 22:37:34 +03:00 committed by Junio C Hamano
parent 898f80736c
commit 714d491af0
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Documentation/diff-options.txt
View File

@ -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