From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 6 Jul 2016 20:38:09 +0000 (-0700)
Subject: Merge branch 'jk/add-i-diff-compact-heuristics'
X-Git-Tag: v2.10.0-rc0~163
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/054d949ffb2e3aa98a97c564dc9c260e7fbab033?hp=--cc

Merge branch 'jk/add-i-diff-compact-heuristics'

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

054d949ffb2e3aa98a97c564dc9c260e7fbab033