Merge branch 'jc/color-diff-doc'
commit3e1b08bbf58173df80895af3bf86d14c77efe877
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:11:31 +0000 (19 12:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:11:32 +0000 (19 12:11 -0700)
tree9ad8bb6901aafc57924d93e6c8780e7eb7c3a4ef
parent048d4d98b35e78c44d93b8009f7b11823660e007
parent3d0e75f2f7a9ae9329154dc85bf5af5c5482f3ea
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
Documentation/diff-options.txt