undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'so/format-patch-doc-on-default-diff-format'

Browse Source 
Docfix.

* so/format-patch-doc-on-default-diff-format:
  doc/diff-options: fix out of place mentions of '--patch/-p'
This commit is contained in:
Junio C Hamano 2020-11-11 13:18:37 -08:00
commit c5a802f0ce
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>:: -U<n>::
--unified=<n>:: --unified=<n>::
Generate diffs with <n> lines of context instead of Generate diffs with <n> lines of context instead of
the usual three. Implies `--patch`. the usual three.
ifndef::git-format-patch[] ifndef::git-format-patch[]
Implies `-p`. Implies `--patch`.
endif::git-format-patch[] endif::git-format-patch[]
--output=<file>:: --output=<file>::
@ -441,7 +441,10 @@ endif::git-format-patch[]
--binary:: --binary::
In addition to `--full-index`, output a binary diff that 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>]:: --abbrev[=<n>]::
Instead of showing the full 40-byte hexadecimal object Instead of showing the full 40-byte hexadecimal object