From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 30 Jun 2011 00:03:13 +0000 (-0700)
Subject: Merge branch 'rs/grep-color'
X-Git-Tag: v1.7.7-rc0~119
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=1692d0c64a6386ae08d12ed90c9d975911451cbe;p=git.git

Merge branch 'rs/grep-color'

* rs/grep-color:
  grep: add --heading
  grep: add --break
  grep: fix coloring of hunk marks between files
---

1692d0c64a6386ae08d12ed90c9d975911451cbe