| commit | 283c63fac2c76deda2058f03000e18fb35d44fb6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Apr 2013 23:15:44 +0000 (24 16:15 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Wed, 24 Apr 2013 23:15:44 +0000 (24 16:15 -0700) | ||
| tree | e26d5b353bd95b688728af37c16c03e9211b4f87 | treesnapshot (tar.gz zip) |
| parent | 499231d9f157d0987d8bdad258ce4cfd9f4c3d1f | commitdiff |
| parent | 61690bf4a1ad499a673995b92cd8ab51104a431c | commitdiff |
Merge branch 'sr/log-SG-no-textconv' into maint
"git log -S/-G" started paying attention to textconv filter, but
there was no way to disable this. Make it honor --no-textconv
option.
* sr/log-SG-no-textconv:
diffcore-pickaxe: unify code for log -S/-G
diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"
diffcore-pickaxe: port optimization from has_changes() to diff_grep()
diffcore-pickaxe: respect --no-textconv
diffcore-pickaxe: remove fill_one()
diffcore-pickaxe: remove unnecessary call to get_textconv()
"git log -S/-G" started paying attention to textconv filter, but
there was no way to disable this. Make it honor --no-textconv
option.
* sr/log-SG-no-textconv:
diffcore-pickaxe: unify code for log -S/-G
diffcore-pickaxe: fix leaks in "log -S<block>" and "log -G<pattern>"
diffcore-pickaxe: port optimization from has_changes() to diff_grep()
diffcore-pickaxe: respect --no-textconv
diffcore-pickaxe: remove fill_one()
diffcore-pickaxe: remove unnecessary call to get_textconv()