From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 11 Jul 2016 17:44:09 +0000 (-0700)
Subject: Merge branch 'jk/add-i-diff-compact-heuristics' into maint
X-Git-Tag: v2.9.1~16
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=52debb683198c50354c46a7745d45252b0989c7e;p=git

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

52debb683198c50354c46a7745d45252b0989c7e