diff options
| author | SZEDER Gábor <szeder.dev@gmail.com> | 2019-08-15 11:12:45 +0200 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-08-15 09:58:47 -0700 |
| commit | 64e5e1fba11e6abf5572150e7cd2ba9afb66d6ce (patch) | |
| tree | 0dc478399ad539cf3df78f783b6b545b96474b9b | |
| parent | 75b2f01a0f642b39b0f29b6218515df9b5eb798e (diff) | |
| download | git-64e5e1fba11e6abf5572150e7cd2ba9afb66d6ce.tar.gz | |
diff: 'diff.indentHeuristic' is no longer experimental
The indent heuristic started out as experimental, but it's now our
default diff heuristic since 33de716387 (diff: enable indent heuristic
by default, 2017-05-08). Alas, that commit didn't update the
documentation, and the description of the 'diff.indentHeuristic'
configuration variable still implies that it's experimental and not
the default.
Update the description of 'diff.indentHeuristic' to make it clear that
it's the default diff heuristic.
The description of the related '--indent-heuristic' option has already
been updated in bab76141da (diff: --indent-heuristic is no
longer experimental, 2017-10-29).
Signed-off-by: SZEDER Gábor <szeder.dev@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| -rw-r--r-- | Documentation/config/diff.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/config/diff.txt b/Documentation/config/diff.txt index 2c4c9ba27a..555790336c 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -188,7 +188,7 @@ diff.guitool:: include::../mergetools-diff.txt[] diff.indentHeuristic:: - Set this option to `true` to enable experimental heuristics + Set this option to `false` to disable the default heuristics that shift diff hunk boundaries to make patches easier to read. diff.algorithm:: |