Merge branch 'ml/color-when'

* ml/color-when:
  Add an optional argument for --color options

diff --cc Documentation/git-grep.txt
Simple merge

diff --cc Documentation/git-show-branch.txt
Simple merge

diff --cc builtin-grep.c
Simple merge

diff --cc builtin-show-branch.c
Simple merge

diff --cc diff.c
Simple merge