summaryrefslogtreecommitdiff
path: root/t/helper/test-tool.h
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-11-18 21:32:53 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-11-18 21:32:53 (GMT)
commita1f95951efc55c97477e32287b06e204553be5c2 (patch)
tree65bda8319dd00e2e2bab2a2a4d77ca1e8f41944a /t/helper/test-tool.h
parent7660da161821ab79b8ecd5019c28843ed7e770a6 (diff)
parent14c4586c2dfa94d86d71a60481dd20bc5b56e562 (diff)
downloadgit-a1f95951efc55c97477e32287b06e204553be5c2.zip
git-a1f95951efc55c97477e32287b06e204553be5c2.tar.gz
git-a1f95951efc55c97477e32287b06e204553be5c2.tar.bz2
Merge branch 'en/merge-ort-api-null-impl'
Preparation for a new merge strategy. * en/merge-ort-api-null-impl: merge,rebase,revert: select ort or recursive by config or environment fast-rebase: demonstrate merge-ort's API via new test-tool command merge-ort-wrappers: new convience wrappers to mimic the old merge API merge-ort: barebones API of new merge strategy with empty implementation
Diffstat (limited to 't/helper/test-tool.h')
-rw-r--r--t/helper/test-tool.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/t/helper/test-tool.h b/t/helper/test-tool.h
index 1467f00..a6470ff 100644
--- a/t/helper/test-tool.h
+++ b/t/helper/test-tool.h
@@ -19,6 +19,7 @@ int cmd__dump_fsmonitor(int argc, const char **argv);
int cmd__dump_split_index(int argc, const char **argv);
int cmd__dump_untracked_cache(int argc, const char **argv);
int cmd__example_decorate(int argc, const char **argv);
+int cmd__fast_rebase(int argc, const char **argv);
int cmd__genrandom(int argc, const char **argv);
int cmd__genzeros(int argc, const char **argv);
int cmd__hashmap(int argc, const char **argv);