Andrew's git / gitweb.git / diff
?
Merge branch 'jc/color-diff-doc'
authorJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:11:31 +0000 (12:11 -0700)
committerJunio C Hamano <gitster@pobox.com>
Tue, 19 Mar 2013 19:11:32 +0000 (12:11 -0700)
The --color[=<when>] option to the diff family was documented in a
confusing way.

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

1  2 
Documentation/diff-options.txt patch | diff1 | diff2 | blob | history
diff --cc Documentation/diff-options.txt
Simple merge