diff options
author | Elijah Newren <newren@gmail.com> | 2020-10-27 02:08:07 +0000 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2020-10-26 22:36:10 -0700 |
commit | 17e5574b0446836af08136ae269b30767c05b1d7 (patch) | |
tree | 808c721a98bad7891f1c82153a4a2875f121bbf3 /t/test-lib-functions.sh | |
parent | Sync with Git 2.29.1 (diff) | |
download | tgif-17e5574b0446836af08136ae269b30767c05b1d7.tar.xz |
merge-ort: barebones API of new merge strategy with empty implementation
This is the beginning of a new merge strategy. While there are some API
differences, and the implementation has some differences in behavior, it
is essentially meant as an eventual drop-in replacement for
merge-recursive.c. However, it is being built to exist side-by-side
with merge-recursive so that we have plenty of time to find out how
those differences pan out in the real world while people can still fall
back to merge-recursive. (Also, I intend to avoid modifying
merge-recursive during this process, to keep it stable.)
The primary difference noticable here is that the updating of the
working tree and index is not done simultaneously with the merge
algorithm, but is a separate post-processing step. The new API is
designed so that one can do repeated merges (e.g. during a rebase or
cherry-pick) and only update the index and working tree one time at the
end instead of updating it with every intermediate result. Also, one
can perform a merge between two branches, neither of which match the
index or the working tree, without clobbering the index or working tree.
The next three commits will demonstrate various uses of this new API.
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 't/test-lib-functions.sh')
0 files changed, 0 insertions, 0 deletions