From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 18 Mar 2009 01:58:02 +0000 (-0700)
Subject: Merge branch 'rs/color-grep'
X-Git-Tag: v1.6.3-rc0~144
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=b332368de87fba4fd9e6f8c163240f14ca00a9ea;p=git.git

Merge branch 'rs/color-grep'

* rs/color-grep:
  grep: prefer builtin over external one when coloring results
  grep: cast printf %.*s "precision" argument explicitly to int
  grep: add support for coloring with external greps
  grep: color patterns in output
  grep: add pmatch and eflags arguments to match_one_pattern()
  grep: remove grep_opt argument from match_expr_eval()
  grep: micro-optimize hit collection for AND nodes
---

b332368de87fba4fd9e6f8c163240f14ca00a9ea