summaryrefslogtreecommitdiff
path: root/Documentation/git-merge-index.txt
diff options
context:
space:
mode:
authorLibravatar Mark Wooding <mdw@distorted.org.uk>2007-01-28 15:17:36 +0000
committerLibravatar Junio C Hamano <junkio@cox.net>2007-01-28 11:06:59 -0800
commit4f193f20a3d1884cc7b6c2a662783a3df8fe5d9b (patch)
tree9a2e412d3c2e6fa9f216e393098ad73c96ad4bfb /Documentation/git-merge-index.txt
parentwt-status: Actually accept `color.status.BLAH' configuration variables. (diff)
downloadtgif-4f193f20a3d1884cc7b6c2a662783a3df8fe5d9b.tar.xz
Documentation/config.txt: Fix documentation of colour config tweaks.
* The description of valid colour specifications was rather incomplete, so fix it so that it actually describes colour specs as accepted by color_parse(). * The list of colour items allowed in color.diff.BLAH was missing the `commit' and `whitespace' entries. Signed-off-by: Mark Wooding <mdw@distorted.org.uk> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'Documentation/git-merge-index.txt')
0 files changed, 0 insertions, 0 deletions