Merge branch 'jk/format-auto-base-when-able'
authorJunio C Hamano <gitster@pobox.com>
Mon, 5 Oct 2020 21:01:55 +0000 (14:01 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 5 Oct 2020 21:01:55 +0000 (14:01 -0700)
commit5f8c70a14836c730c78533e35401db8269a96aa2
tree05f23b5e5601d70987193ec29d8f79c8de935ec7
parent7da656f1e083b065400c4ab92405c6332481eb7a
parent7efba5fa39fa1608fccea51a849b36b0f85825bb
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
builtin/log.c