summaryrefslogtreecommitdiff
path: root/t
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2018-11-18 09:23:59 (GMT)
committerJunio C Hamano <gitster@pobox.com>2018-11-18 09:23:59 (GMT)
commit4520c233742cca267e1c0ba55f04f35ef7e9baf7 (patch)
treec492d0450700e918465d75e01e924d18f9327b2a /t
parent137c1f2f51bceb8d1f1f457c52129be78c0ac86d (diff)
parent62c23938fae5b7a374388c64fbdf8ee9ecb51b92 (diff)
downloadgit-4520c233742cca267e1c0ba55f04f35ef7e9baf7.zip
git-4520c233742cca267e1c0ba55f04f35ef7e9baf7.tar.gz
git-4520c233742cca267e1c0ba55f04f35ef7e9baf7.tar.bz2
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')
-rw-r--r--t/README4
1 files changed, 4 insertions, 0 deletions
diff --git a/t/README b/t/README
index 2424974..3df5d12 100644
--- a/t/README
+++ b/t/README
@@ -339,6 +339,10 @@ for the index version specified. Can be set to any valid version
GIT_TEST_PRELOAD_INDEX=<boolean> exercises the preload-index code path
by overriding the minimum number of cache entries required per thread.
+GIT_TEST_REBASE_USE_BUILTIN=<boolean>, when false, disables the
+builtin version of git-rebase. See 'rebase.useBuiltin' in
+git-config(1).
+
GIT_TEST_INDEX_THREADS=<n> enables exercising the multi-threaded loading
of the index for the whole test suite by bypassing the default number of
cache entries and thread minimums. Setting this to 1 will make the