[PATCH] doc/diff-options: fix out of place mentions of '--patch/-p'
- From
Sergey Organov <sorganov@gmail.com>
- Date
- Oct 31, 2020, 19:37 UTC
- Message-ID
- <20201031193734.22702-1-sorganov@gmail.com>
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> --- Documentation/diff-options.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 573fb9bb71e2..320304033483 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
-- 2.25.1