From: Junio C Hamano <gitster@pobox.com>
Date: Tue, 10 Jan 2017 23:24:27 +0000 (-0800)
Subject: Merge branch 'jc/retire-compaction-heuristics'
X-Git-Tag: v2.12.0-rc0~82
X-Git-Url: http://git.bitbasher.net/?a=commitdiff_plain;h=2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d;p=git.git

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

2ced5f2c2ddcfe3a45d75ae1d552c11cad70236d