summaryrefslogtreecommitdiff
path: root/diffcore-order.c
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-07-11 10:44:09 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-07-11 10:44:09 -0700
commit52debb683198c50354c46a7745d45252b0989c7e (patch)
treec59e853ccb7463f3a75de2de809f522ebfbfddc2 /diffcore-order.c
parentMore fixes for 2.9.1 (diff)
parentadd--interactive: respect diff.compactionHeuristic (diff)
downloadtgif-52debb683198c50354c46a7745d45252b0989c7e.tar.xz
Merge branch 'jk/add-i-diff-compact-heuristics' into maint
"git add -i/-p" learned to honor diff.compactionHeuristic experimental knob, so that the user can work on the same hunk split as "git diff" output. * jk/add-i-diff-compact-heuristics: add--interactive: respect diff.compactionHeuristic
Diffstat (limited to 'diffcore-order.c')
0 files changed, 0 insertions, 0 deletions