diff options
| author | Junio C Hamano <gitster@pobox.com> | 2015-06-25 18:02:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-25 18:02:11 (GMT) |
| commit | 6998d890c7120fe2d30fa0b6f80ddfaad716f632 (patch) | |
| tree | 8a17d03e86dfb10d072225c303a576fe32d8d4cd /Documentation | |
| parent | c5baf18a404a9713e1b75161855cacbfec32fcf2 (diff) | |
| parent | 8dbf3eb6850d6d9495ace908625fe50888b111e6 (diff) | |
| download | git-6998d890c7120fe2d30fa0b6f80ddfaad716f632.zip git-6998d890c7120fe2d30fa0b6f80ddfaad716f632.tar.gz git-6998d890c7120fe2d30fa0b6f80ddfaad716f632.tar.bz2 | |
Merge branch 'jk/color-diff-plain-is-context' into maint
"color.diff.plain" was a misnomer; give it 'color.diff.context' as
a more logical synonym.
* jk/color-diff-plain-is-context:
diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT
diff: accept color.diff.context as a synonym for "plain"
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/config.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt index f4fb31a..2e919f0 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -906,7 +906,8 @@ command line with the `--color[=<when>]` option. color.diff.<slot>:: Use customized color for diff colorization. `<slot>` specifies which part of the patch to use the specified color, and is one - of `plain` (context text), `meta` (metainformation), `frag` + of `context` (context text - `plain` is a historical synonym), + `meta` (metainformation), `frag` (hunk header), 'func' (function in hunk header), `old` (removed lines), `new` (added lines), `commit` (commit headers), or `whitespace` (highlighting whitespace errors). |