summaryrefslogtreecommitdiff
path: root/t/t6023-merge-file.sh
diff options
context:
space:
mode:
authorLibravatar Ævar Arnfjörð Bjarmason <avarab@gmail.com>2018-11-14 09:15:05 +0000
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-16 19:02:54 +0900
commitd8d0a546f04be2990d50425fe152af915bc3b82f (patch)
tree43b01ed74695949bce848da8f2aa83e5974985b1 /t/t6023-merge-file.sh
parentTenth batch for 2.20 (diff)
downloadtgif-d8d0a546f04be2990d50425fe152af915bc3b82f.tar.xz
rebase doc: document rebase.useBuiltin
The rebase.useBuiltin variable introduced in 55071ea248 ("rebase: start implementing it as a builtin", 2018-08-07) was turned on by default in 5541bd5b8f ("rebase: default to using the builtin rebase", 2018-08-08), but had no documentation. Let's document it so that users who run into any stability issues with the C rewrite know there's an escape hatch[1], and make it clear that needing to turn off builtin rebase means you've found a bug in git. 1. https://public-inbox.org/git/87y39w1wc2.fsf@evledraar.gmail.com/ Signed-off-by: Ævar Arnfjörð Bjarmason <avarab@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/t6023-merge-file.sh')
0 files changed, 0 insertions, 0 deletions