diff options
| author | Junio C Hamano <gitster@pobox.com> | 2016-04-29 15:18:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2016-04-29 15:19:28 -0700 |
| commit | 0d292e746962a53fcf019e9ed5cbd27f2bbf9648 (patch) | |
| tree | 5796ec5dce0a0e506991a3333582283d4396ea34 /Documentation/diff-options.txt | |
| parent | d634d61ed6c5f19948937012b5e3a0ed2d631d3f (diff) | |
| download | git-jc/diff-compact-always-use-blank-heuristics.tar.gz | |
diff: enable "compaction heuristics" and lose experimentation knobjc/diff-compact-always-use-blank-heuristics
It seems that the new "find a good hunk boundary by locating a blank
line" heuristics gives much more pleasant result without much
noticeable downsides. Let's make it the new algorithm for real,
without the opt-out knob we added while experimenting with it.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/diff-options.txt')
| -rw-r--r-- | Documentation/diff-options.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/Documentation/diff-options.txt b/Documentation/diff-options.txt index b513023cd7..3ad6404dbc 100644 --- a/Documentation/diff-options.txt +++ b/Documentation/diff-options.txt @@ -63,12 +63,6 @@ ifndef::git-format-patch[] Synonym for `-p --raw`. endif::git-format-patch[] ---compaction-heuristic:: ---no-compaction-heuristic:: - These are to help debugging and tuning an experimental - heuristic that shifts the hunk boundary in an attempt to - make the resulting patch easier to read. - --minimal:: Spend extra time to make sure the smallest possible diff is produced. |