summaryrefslogtreecommitdiff
path: root/t/t3034-merge-recursive-rename-options.sh
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2018-11-18 18:23:59 +0900
committerLibravatar Junio C Hamano <gitster@pobox.com>2018-11-18 18:23:59 +0900
commit4520c233742cca267e1c0ba55f04f35ef7e9baf7 (patch)
treec492d0450700e918465d75e01e924d18f9327b2a /t/t3034-merge-recursive-rename-options.sh
parentMerge branch 'js/rebase-am-options' (diff)
parenttests: add a special setup where rebase.useBuiltin is off (diff)
downloadtgif-4520c233742cca267e1c0ba55f04f35ef7e9baf7.tar.xz
Merge branch 'ab/rebase-in-c-escape-hatch'
The recently merged "rebase in C" has an escape hatch to use the scripted version when necessary, but it hasn't been documented, which has been corrected. * ab/rebase-in-c-escape-hatch: tests: add a special setup where rebase.useBuiltin is off rebase doc: document rebase.useBuiltin
Diffstat (limited to 't/t3034-merge-recursive-rename-options.sh')
0 files changed, 0 insertions, 0 deletions