From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 5 Oct 2020 21:01:55 +0000 (-0700)
Subject: Merge branch 'jk/format-auto-base-when-able'
X-Git-Tag: v2.29.0-rc0~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5f8c70a14836c730c78533e35401db8269a96aa2;p=thirdparty%2Fgit.git

Merge branch 'jk/format-auto-base-when-able'

"git format-patch" learns to take "whenAble" as a possible value
for the format.useAutoBase configuration variable to become no-op
when the  automatically computed base does not make sense.

* jk/format-auto-base-when-able:
  format-patch: teach format.useAutoBase "whenAble" option
---

5f8c70a14836c730c78533e35401db8269a96aa2