From: Junio C Hamano <gitster@pobox.com>
Date: Thu, 9 Jul 2009 07:59:58 +0000 (-0700)
Subject: Merge branch 'rs/grep-p'
X-Git-Tag: v1.6.4-rc0~4
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=128a9d86da3c156c7d1bf25692eeb68a522af935;p=git.git

Merge branch 'rs/grep-p'

* rs/grep-p:
  grep: simplify -p output
  grep -p: support user defined regular expressions
  grep: add option -p/--show-function
  grep: handle pre context lines on demand
  grep: print context hunk marks between files
  grep: move context hunk mark handling into show_line()
  userdiff: add xdiff_clear_find_func()
---

128a9d86da3c156c7d1bf25692eeb68a522af935