From: Junio C Hamano <gitster@pobox.com>
Date: Sat, 20 Mar 2010 18:29:36 +0000 (-0700)
Subject: Merge branch 'ml/color-grep'
X-Git-Tag: v1.7.1-rc0~51
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=f1aa782a3b72a2c4de46dc93b484eb99dc01d4d0;p=thirdparty%2Fgit.git

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_*
---

f1aa782a3b72a2c4de46dc93b484eb99dc01d4d0