projects / git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6be64a8 3cde4e0)
Merge branch 'jc/retire-compaction-heuristics' into next
authorJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 23:00:31 +0000 (15:00 -0800)
committerJunio C Hamano <gitster@pobox.com>
Tue, 27 Dec 2016 23:00:31 +0000 (15:00 -0800)
commitc69c2f50cfc0dcd4bcd014c7fd56e344a7c5522f
tree2f1b3d7ed14a2146e755cb734e74f9a9c00b97detree | snapshot
parent6be64a8671f887b22956c440910a01ac2d40ce82commit | diff
parent3cde4e02ee891bff53bac7f6a7d977f50418a4b5commit | diff
Merge branch 'jc/retire-compaction-heuristics' into next

"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 diff1 | diff2 | blob | history
git-add--interactive.perl diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.