From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 9 Sep 2019 19:26:36 +0000 (-0700)
Subject: Merge branch 'sg/diff-indent-heuristic-non-experimental'
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/e1151704f22ce3de778527047ecfd033e6f1aa83?hp=-c

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

e1151704f22ce3de778527047ecfd033e6f1aa83
diff --combined Documentation/config/diff.txt
index 5afb5a2cbc,555790336c..ff09f1cf73
--- a/Documentation/config/diff.txt
+++ b/Documentation/config/diff.txt
@@@ -78,8 -78,7 +78,8 @@@ diff.external:
  diff.ignoreSubmodules::
  	Sets the default value of --ignore-submodules. Note that this
  	affects only 'git diff' Porcelain, and not lower level 'diff'
 -	commands such as 'git diff-files'. 'git checkout' also honors
 +	commands such as 'git diff-files'. 'git checkout'
 +	and 'git switch' also honor
  	this setting when reporting uncommitted changes. Setting it to
  	'all' disables the submodule summary normally shown by 'git commit'
  	and 'git status' when `status.submoduleSummary` is set unless it is
@@@ -189,7 -188,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::