From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 15 Nov 2017 03:05:04 +0000 (+0900)
Subject: Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint
X-Git-Tag: v2.15.1~21
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746;p=thirdparty%2Fgit.git

Merge branch 'cn/diff-indent-no-longer-is-experimental' into maint

Doc update.

* cn/diff-indent-no-longer-is-experimental:
  diff: --indent-heuristic is no longer experimental
---

da2b4ee3888d3df7dad6df5d0e5d2d8d3fa09746