]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: c9f5fc9 cae0bc0)
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)
commit71a7de7a99a3199a9ea0660287bd4c1747f4d3b6
tree1b8efa2809270ee2131954f26f3d6850ed19868dtree | snapshot
parentc9f5fc91142c26c4a0f69f8eaed35c55e9c591f5commit | diff
parentcae0bc09abcb12aff79f1aea85d578df7856de4acommit | diff
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
builtin/log.c diff1 | diff2 | blob | history
builtin/rebase.c diff1 | diff2 | blob | history
t/t3400-rebase.sh diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.