diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:03 +0900 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-04-16 19:28:03 +0900 |
| commit | 8a9a837a639cb4ef4c0b84c277aec2c9eb7ec58d (patch) | |
| tree | 145078165523e01adf4aaeb1b6c33ec11fefc420 /Documentation/diff-options.txt | |
| parent | The fourth batch (diff) | |
| parent | diff-parseopt: convert --submodule (diff) | |
| download | tgif-8a9a837a639cb4ef4c0b84c277aec2c9eb7ec58d.tar.xz | |
Merge branch 'nd/diff-parseopt-3'
Third batch to teach the diff machinery to use the parse-options
API.
* nd/diff-parseopt-3:
diff-parseopt: convert --submodule
diff-parseopt: convert --ignore-submodules
diff-parseopt: convert --textconv
diff-parseopt: convert --ext-diff
diff-parseopt: convert --quiet
diff-parseopt: convert --exit-code
diff-parseopt: convert --color-words
diff-parseopt: convert --word-diff-regex
diff-parseopt: convert --word-diff
diff-parseopt: convert --[no-]color
diff-parseopt: convert --[no-]follow
diff-parseopt: convert -R
diff-parseopt: convert -a|--text
diff-parseopt: convert --full-index
diff-parseopt: convert --binary
diff-parseopt: convert --anchored
diff-parseopt: convert --diff-algorithm
diff-parseopt: convert --histogram
diff-parseopt: convert --patience
diff-parseopt: convert --[no-]indent-heuristic
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index 5ebc56867b..09faee3b44 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -436,7 +436,7 @@ endif::git-format-patch[] --binary:: In addition to `--full-index`, output a binary diff that - can be applied with `git-apply`. + can be applied with `git-apply`. Implies `--patch`. --abbrev[=<n>]:: Instead of showing the full 40-byte hexadecimal object |