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)
commit8e8c8817cd3e61d974e02f7276ded1f4cb97d8f3
treeb0c53545af2a313e94ecb59663417840f00f879b
parent31d66aa4084cb292b15cfdcd6ff73f22f45ab9af
parentef90ab66e8eaa863777a8d383c5af2ff43a426d2
Merge branch 'jk/pickaxe-textconv' into maint

"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.