From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 19 Mar 2013 19:11:31 +0000 (-0700)
Subject: Merge branch 'jc/color-diff-doc'
X-Git-Tag: v1.8.3-rc0~225
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=3e1b08bbf58173df80895af3bf86d14c77efe877;p=thirdparty%2Fgit.git

Merge branch 'jc/color-diff-doc'

The --color[=<when>] option to the diff family was documented in a
confusing way.

* jc/color-diff-doc:
  diff-options: unconfuse description of --color
---

3e1b08bbf58173df80895af3bf86d14c77efe877