| commit | 71a7de7a99a3199a9ea0660287bd4c1747f4d3b6 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Dec 2019 21:08:32 +0000 (16 13:08 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Mon, 16 Dec 2019 21:08:32 +0000 (16 13:08 -0800) | ||
| tree | 1b8efa2809270ee2131954f26f3d6850ed19868d | treesnapshot (tar.gz zip) |
| parent | c9f5fc91142c26c4a0f69f8eaed35c55e9c591f5 | commitdiff |
| parent | cae0bc09abcb12aff79f1aea85d578df7856de4a | commitdiff |
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
"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 | blobhistory |
| builtin/rebase.c | diff1 | diff2 | blobhistory |
| t/t3400-rebase.sh | diff1 | diff2 | blobhistory |