From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 25 Mar 2013 20:44:53 +0000 (-0700)
Subject: Merge branch 'jc/color-diff-doc' into maint-1.8.1
X-Git-Tag: v1.8.1.6~26
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82b955c513e403adaf7b39ea621678bbce6b2ede;p=git

Merge branch 'jc/color-diff-doc' into maint-1.8.1

The "--color=<when>" argument to the commands in the diff family
was described poorly.

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

82b955c513e403adaf7b39ea621678bbce6b2ede