diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-09-09 12:26:36 -0700 |
| commit | e1151704f22ce3de778527047ecfd033e6f1aa83 (patch) | |
| tree | a1761e38e97528af2972c3120a8b746e456082d5 /Documentation | |
| parent | Merge branch 'ds/feature-macros' (diff) | |
| parent | diff: 'diff.indentHeuristic' is no longer experimental (diff) | |
| download | tgif-e1151704f22ce3de778527047ecfd033e6f1aa83.tar.xz | |
Merge branch 'sg/diff-indent-heuristic-non-experimental'
We promoted the "indent heuristics" that decides where to split
diff hunks from experimental to the default a few years ago, but
some stale documentation still marked it as experimental, which has
been corrected.
* sg/diff-indent-heuristic-non-experimental:
diff: 'diff.indentHeuristic' is no longer experimental
Diffstat (limited to 'Documentation')
| -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 5afb5a2cbc..ff09f1cf73 100644 --- a/Documentation/config/diff.txt +++ b/Documentation/config/diff.txt @@ -189,7 +189,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:: |