]> granicus.if.org Git - git/commit
Merge branch 'sg/diff-indent-heuristic-non-experimental' into next
authorJunio C Hamano <gitster@pobox.com>
Fri, 23 Aug 2019 21:33:46 +0000 (14:33 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 23 Aug 2019 21:33:46 +0000 (14:33 -0700)
commitfaab5e2a1e3bf15e7c7949ee71e273ded06ccbdb
treea1761e38e97528af2972c3120a8b746e456082d5
parent115f0c8df9bf638d9d387c21f795e10fa8db396d
parent64e5e1fba11e6abf5572150e7cd2ba9afb66d6ce
Merge branch 'sg/diff-indent-heuristic-non-experimental' into next

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
Documentation/config/diff.txt