diff options
| author | Junio C Hamano <gitster@pobox.com> | 2020-11-11 14:10:41 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-11 14:10:41 -0800 |
| commit | ee43d18844df1f78dad8b389cbb393b211073d17 (patch) | |
| tree | 7f6be6f8062026ad72363aa7f030ab774761f597 /diff-options.txt | |
| parent | a65c1f44a0fb82bf498be0911b85fa42bb70147f (diff) | |
| download | git-htmldocs-ee43d18844df1f78dad8b389cbb393b211073d17.tar.gz | |
Autogenerated HTML docs for v2.29.2-260-ge31ab
Diffstat (limited to 'diff-options.txt')
| -rw-r--r-- | diff-options.txt | 12 |
1 files changed, 8 insertions, 4 deletions
diff --git a/diff-options.txt b/diff-options.txt index ee52b65e4..2e7a93894 100644 --- a/diff-options.txt +++ b/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,12 +441,16 @@ 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 name in diff-raw format output and diff-tree header - lines, show only a partial prefix. + lines, show the shortest prefix that is at least '<n>' + hexdigits long that uniquely refers the object. In diff-patch output format, `--full-index` takes higher precedence, i.e. if `--full-index` is specified, full blob names will be shown regardless of `--abbrev`. |