Merge branch 'jc/color-diff-doc' into maint-1.8.1
commit82b955c513e403adaf7b39ea621678bbce6b2ede
authorJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:44:53 +0000 (25 13:44 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 25 Mar 2013 20:44:53 +0000 (25 13:44 -0700)
tree3f90b03cb405cf14a17e8bce0d45ad4466e161b9
parent617cf93182279eec554dda03f44ac6a250e183aa
parent3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea
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
Documentation/diff-options.txt