On 3/19/2021 8:03 PM, Elijah Newren via GitGitGadget wrote: > This series depends on ort-perf-batch-10[1], and obsoletes the ort-remainder > topic[2] (that hadn't been picked up yet, so hopefully this doesn't cause > any confusion) > > With this series, merge-ort is ready for general usage -- it passes all > tests, passes dozens of tests that don't under merge-recursive, and > merge-ort is is already significantly faster than merge-recursive when > rename detection is involved. Users can select merge-ort by (a) passing > -sort to either git merge or git rebase, or (b) by setting pull.twohead=ort > [3], or (c) by setting GIT_TEST_MERGE_ALGORITHM=ort. > > Changes since v2: > > * changed the last patch to default testing to ort so people don't have to > wait until CI for failures (but still keep linux-gcc testing > merge-recursive so it retains coverage), as suggested by Stolee What a great suggestion! This series gets Reviewed-by: Derrick Stolee <dstolee@xxxxxxxxxxxxx>
