My Various Git Projects / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 845351c 46e3d17)
Merge branch 'jk/add-i-diff-compact-heuristics'
authorJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:09 +0000 (13:38 -0700)
committerJunio C Hamano <gitster@pobox.com>
Wed, 6 Jul 2016 20:38:09 +0000 (13:38 -0700)
"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


Trivial merge
The core git plumbing