diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2015-06-11 09:29:53 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-06-11 09:29:53 -0700 |
| commit | db65170ee5558b47355e7f9f111aecb5b152d4d9 (patch) | |
| tree | 475abf30cf47918b0e2d01b01ace04d20c498898 /Documentation/config.txt | |
| parent | Merge branch 'jk/clone-dissociate' (diff) | |
| parent | diff.h: rename DIFF_PLAIN color slot to DIFF_CONTEXT (diff) | |
| download | tgif-db65170ee5558b47355e7f9f111aecb5b152d4d9.tar.xz | |
Merge branch 'jk/color-diff-plain-is-context'
"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/config.txt')
| -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 4d21ce1647..43bb53c047 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -914,7 +914,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). |