Junio C Hamano a1f95951ef 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		2020-11-18 13:32:53 -08:00
..
.gitignore	drop vcs-svn experiment	2020-08-13 11:02:15 -07:00
test-advise.c	test-advise: check argument count with argc instead of argv	2020-09-30 12:53:48 -07:00
test-bloom.c	Merge branch 'tb/bloom-improvements'	2020-09-29 14:01:20 -07:00
test-chmtime.c
test-config.c	config: fix leaks from git_config_get_string_const()	2020-08-14 10:52:04 -07:00
test-crontab.c	maintenance: add start/stop subcommands	2020-09-25 10:59:44 -07:00
test-ctype.c
test-date.c
test-delta.c
test-dir-iterator.c
test-drop-caches.c
test-dump-cache-tree.c
test-dump-fsmonitor.c
test-dump-split-index.c
test-dump-untracked-cache.c
test-example-decorate.c
test-fake-ssh.c
test-fast-rebase.c	fast-rebase: demonstrate merge-ort's API via new test-tool command	2020-10-29 14:05:48 -07:00
test-genrandom.c
test-genzeros.c
test-hash-speed.c
test-hash.c
test-hashmap.c
test-index-version.c
test-json-writer.c
test-lazy-init-name-hash.c
test-match-trees.c
test-mergesort.c
test-mktemp.c
test-oid-array.c
test-oidmap.c
test-online-cpus.c
test-parse-options.c
test-parse-pathspec-file.c
test-path-utils.c
test-pkt-line.c	test-pkt-line: drop colon from sideband identity	2020-10-27 11:57:51 -07:00
test-prio-queue.c
test-proc-receive.c	receive-pack: add new proc-receive hook	2020-08-27 12:47:47 -07:00
test-progress.c
test-reach.c	commit-reach: fix in_merge_bases_many bug	2020-10-02 10:26:31 -07:00
test-read-cache.c
test-read-graph.c	t/helper/test-read-graph.c: prepare repo settings	2020-09-09 12:51:48 -07:00
test-read-midx.c	multi-pack-index: use hash version byte	2020-08-17 16:45:20 -07:00
test-ref-store.c
test-regex.c
test-repository.c
test-revision-walking.c
test-run-command.c	strvec: rename struct fields	2020-07-30 19:18:06 -07:00
test-scrap-cache-tree.c
test-serve-v2.c
test-sha1.c
test-sha1.sh
test-sha256.c
test-sigchain.c
test-strcmp-offset.c
test-string-list.c
test-submodule-config.c
test-submodule-nested-repo-config.c	drop unused argc parameters	2020-09-30 12:53:47 -07:00
test-subprocess.c
test-tool.c	Merge branch 'en/merge-ort-api-null-impl'	2020-11-18 13:32:53 -08:00
test-tool.h	Merge branch 'en/merge-ort-api-null-impl'	2020-11-18 13:32:53 -08:00
test-trace2.c	strvec: rename files from argv-array to strvec	2020-07-28 15:02:17 -07:00
test-urlmatch-normalization.c
test-wildmatch.c
test-windows-named-pipe.c
test-write-cache.c
test-xml-encode.c