Merge branch 'jk/pickaxe-textconv' into maint
authorJunio C Hamano <gitster@pobox.com>
Tue, 18 Dec 2012 18:50:07 +0000 (10:50 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 18 Dec 2012 18:50:07 +0000 (10:50 -0800)
"git log -p -S<string>" now looks for the <string> after applying
the textconv filter (if defined); earlier it inspected the contents
of the blobs without filtering.


Trivial merge