Merge branch 'ml/color-grep'

* ml/color-grep:
  grep: Colorize selected, context, and function lines
  grep: Colorize filename, line number, and separator
  Add GIT_COLOR_BOLD_* and GIT_COLOR_BG_*

diff --cc Documentation/config.txt
Simple merge

diff --cc builtin/grep.c
Simple merge

diff --cc color.h
Simple merge

diff --cc grep.c
Simple merge

diff --cc grep.h
Simple merge