diff options
| author | Jeff King <peff@peff.net> | 2015-05-27 07:22:19 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2015-05-27 20:54:37 (GMT) |
| commit | 74b15bfbf6f7efffa40fda170b3a3cb0218d8651 (patch) | |
| tree | c16ad79e5098f609e7c61301ca995fdbe3ebdc32 /Documentation | |
| parent | fdf96a20acf96a6ac538df8113b2aafd6ed71d50 (diff) | |
| download | git-74b15bfbf6f7efffa40fda170b3a3cb0218d8651.zip git-74b15bfbf6f7efffa40fda170b3a3cb0218d8651.tar.gz git-74b15bfbf6f7efffa40fda170b3a3cb0218d8651.tar.bz2 | |
diff: accept color.diff.context as a synonym for "plain"
The term "plain" is a bit ambiguous; let's allow the more
specific "context", but keep "plain" around for
compatibility.
Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 9335ff2..b458590 100644 --- a/Documentation/config.txt +++ b/Documentation/config.txt @@ -870,7 +870,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). The values of these variables may be |