summaryrefslogtreecommitdiff
path: root/Documentation/howto/rebase-from-internal-branch.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-06-10 10:58:55 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-06-10 13:45:23 -0700
commit5580b271af518bae30148edfd42cc8459d8da384 (patch)
tree242a1fdf0b8cd5e259b38bab96f8866564188abd /Documentation/howto/rebase-from-internal-branch.txt
parentdiff: undocument the compaction heuristic knobs for experimentation (diff)
downloadtgif-5580b271af518bae30148edfd42cc8459d8da384.tar.xz
diff: disable compaction heuristic for now
http://lkml.kernel.org/g/20160610075043.GA13411@sigill.intra.peff.net reports that a change to add a new "function" with common ending with the existing one at the end of the file is shown like this: def foo do_foo_stuff() + common_ending() +end + +def bar + do_bar_stuff() + common_ending() end when the new heuristic is in use. In reality, the change is to add the blank line before "def bar" and everything below, which is what the code without the new heuristic shows. Disable the heuristics by default, and resurrect the documentation for the option and the configuration variables, while clearly marking the feature as still experimental. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/howto/rebase-from-internal-branch.txt')
0 files changed, 0 insertions, 0 deletions