]> git.ipfire.org Git - thirdparty/git.git/commitdiff
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)
"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

1  2 
builtin/log.c

diff --cc builtin/log.c
Simple merge