]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'dl/rebase-with-autobase'
authorJunio C Hamano <gitster@pobox.com>
Mon, 16 Dec 2019 21:08:32 +0000 (13:08 -0800)
committerJunio C Hamano <gitster@pobox.com>
Mon, 16 Dec 2019 21:08:32 +0000 (13:08 -0800)
"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

1  2 
builtin/log.c
builtin/rebase.c
t/t3400-rebase.sh

diff --cc builtin/log.c
Simple merge
Simple merge
Simple merge