From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 20 Nov 2012 18:03:12 +0000 (-0800)
Subject: Merge branch 'jk/maint-diff-grep-textconv' into maint
X-Git-Tag: v1.8.0.1~11
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=35cae74c4d38b79ca80f6e62761f64fa67e8e609;p=git.git

Merge branch 'jk/maint-diff-grep-textconv' into maint

"git diff -G<pattern>" did not honor textconv filter when looking
for changes.

* jk/maint-diff-grep-textconv:
  diff_grep: use textconv buffers for add/deleted files
---

35cae74c4d38b79ca80f6e62761f64fa67e8e609