merge-strategies.txt: add coverage of the `ort` merge strategy
Acked-by: Derrick Stolee <dstolee@microsoft.com> Acked-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Elijah Newren <newren@gmail.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Elijah Newren committed
Aug 4, 2021 at 23:50 UTC
67feccd3ba4566392774b8ed9492d7169031d4bb
1 file changed
+14
Documentation/merge-strategies.txt
+14
@@ -95,6 +95,20 @@ subtree[=<path>];;
95
is prefixed (or stripped from the beginning) to make the shape of
96
two trees to match.
97
98
+ort::
99
+ This is meant as a drop-in replacement for the `recursive`
100
+ algorithm (as reflected in its acronym -- "Ostensibly
101
+ Recursive's Twin"), and will likely replace it in the future.
102
+ It fixes corner cases that the `recursive` strategy handles
103
+ suboptimally, and is significantly faster in large
104
+ repositories -- especially when many renames are involved.
105
++
106
+The `ort` strategy takes all the same options as `recursive`.
107
+However, it ignores three of those options: `no-renames`,
108
+`patience` and `diff-algorithm`. It always runs with rename
109
+detection (it handles it much faster than `recursive` does), and
110
+it specifically uses `diff-algorithm=histogram`.
111
+
112
resolve::
113
This can only resolve two heads (i.e. the current branch
114
and another branch you pulled from) using a 3-way merge