Merge branch 'ml/color-when' into next
authorJunio C Hamano <gitster@pobox.com>
Sun, 21 Feb 2010 21:46:43 +0000 (13:46 -0800)
committerJunio C Hamano <gitster@pobox.com>
Sun, 21 Feb 2010 21:46:43 +0000 (13:46 -0800)
commitd52c051f421da80f7dc5fed68a7046d70d06d008
tree61dd40aba5cdba26d13164699d16e30a49b07e28
parent65fded0aca0e7cc1370f60a40555674e2cf51d35
parent73e9da019655261e456ed862340880de365111f0
Merge branch 'ml/color-when' into next

* 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