From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 16 Dec 2019 21:08:32 +0000 (-0800)
Subject: Merge branch 'dl/rebase-with-autobase'
X-Git-Tag: v2.25.0-rc0~31
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=71a7de7a99a3199a9ea0660287bd4c1747f4d3b6;p=thirdparty%2Fgit.git

Merge branch 'dl/rebase-with-autobase'

"git rebase" did not work well when format.useAutoBase
configuration variable is set, which has been corrected.

* dl/rebase-with-autobase:
  rebase: fix format.useAutoBase breakage
  format-patch: teach --no-base
  t4014: use test_config()
  format-patch: fix indentation
  t3400: demonstrate failure with format.useAutoBase
---

71a7de7a99a3199a9ea0660287bd4c1747f4d3b6