Merge branch 'ml/color-when'
authorJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:06 +0000 (12:44 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 2 Mar 2010 20:44:06 +0000 (12:44 -0800)
* ml/color-when:
  Add an optional argument for --color options

1  2 
Documentation/git-grep.txt
Documentation/git-show-branch.txt
builtin-grep.c
builtin-show-branch.c
diff.c

Simple merge
Simple merge
diff --cc builtin-grep.c
Simple merge
Simple merge
diff --cc diff.c
Simple merge