Merge branch 'jc/retire-compaction-heuristics'
commit2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d
authorJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:24:27 +0000 (10 15:24 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 10 Jan 2017 23:24:27 +0000 (10 15:24 -0800)
tree119f95fb9e29fc40c111984b0ab51f75d2a65f68
parent42087233c35793a3c2279dd4deab9d021142f100
parent3cde4e02ee891bff53bac7f6a7d977f50418a4b5
Merge branch 'jc/retire-compaction-heuristics'

"git diff" and its family had two experimental heuristics to shift
the contents of a hunk to make the patch easier to read.  One of
them turns out to be better than the other, so leave only the
"--indent-heuristic" option and remove the other one.

* jc/retire-compaction-heuristics:
  diff: retire "compaction" heuristics
diff.c
git-add--interactive.perl