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)
commitc06951894ac943b2aaa288b0e9dc1eb605dfb7b6
treec84152355c7fe666d0bb16197e36eb63e33e0c13
parent6954ef206343d366c365f5946caa967f92d7bab1
parent73e9da019655261e456ed862340880de365111f0
Merge branch 'ml/color-when'

* ml/color-when:
  Add an optional argument for --color options
Documentation/git-grep.txt
Documentation/git-show-branch.txt
builtin-grep.c
builtin-show-branch.c
diff.c