From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 25 Jun 2015 18:02:11 +0000 (-0700)
Subject: Merge branch 'jk/color-diff-plain-is-context' into maint
X-Git-Tag: v2.4.5~6
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/6998d890c7120fe2d30fa0b6f80ddfaad716f632

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"
---

6998d890c7120fe2d30fa0b6f80ddfaad716f632
diff --cc Documentation/config.txt
index f4fb31a08d,b458590f26..2e919f0df8
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@@ -906,10 -870,12 +906,11 @@@ command line with the `--color[=<when>]
  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
 -	specified as in color.branch.<slot>.
 +	(highlighting whitespace errors).
  
  color.decorate.<slot>::
  	Use customized color for 'git log --decorate' output.  `<slot>` is one