summaryrefslogtreecommitdiff
path: root/diff.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-04-24 16:15:44 -0700
committerJunio C Hamano <gitster@pobox.com>2013-04-24 16:15:44 -0700
commit283c63fac2c76deda2058f03000e18fb35d44fb6 (patch)
treee26d5b353bd95b688728af37c16c03e9211b4f87 /diff.c
parent499231d9f157d0987d8bdad258ce4cfd9f4c3d1f (diff)
parent61690bf4a1ad499a673995b92cd8ab51104a431c (diff)
downloadgit-283c63fac2c76deda2058f03000e18fb35d44fb6.tar.gz
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()
Diffstat (limited to 'diff.c')
0 files changed, 0 insertions, 0 deletions