summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2011-05-31 09:14:17 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2011-05-31 09:21:36 -0700
commit28b9264dd6cbadcef8b3e48c24ffcb2893b668b3 (patch)
tree2b44427e3c46bf333a17cab937a340ed611e4489 /Documentation/git-merge.txt
parentdiff_tree: disable QUICK optimization with diff filter (diff)
downloadtgif-28b9264dd6cbadcef8b3e48c24ffcb2893b668b3.tar.xz
diff: futureproof "stop feeding the backend early" logic
Refactor the "do not stop feeding the backend early" logic into a small helper function and use it in both run_diff_files() and diff_tree() that has the stop-early optimization. We may later add other types of diffcore transformation that require to look at the whole result like diff-filter does, and having the logic in a single place is essential for longer term maintainability. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/git-merge.txt')
0 files changed, 0 insertions, 0 deletions