diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2019-12-16 13:08:32 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2019-12-16 13:08:32 -0800 |
| commit | 71a7de7a99a3199a9ea0660287bd4c1747f4d3b6 (patch) | |
| tree | 1b8efa2809270ee2131954f26f3d6850ed19868d /builtin/checkout.c | |
| parent | Merge branch 'dl/test-cleanup' (diff) | |
| parent | rebase: fix format.useAutoBase breakage (diff) | |
| download | tgif-71a7de7a99a3199a9ea0660287bd4c1747f4d3b6.tar.xz | |
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
Diffstat (limited to 'builtin/checkout.c')
0 files changed, 0 insertions, 0 deletions