mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
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>
This commit is contained in:
parent
6320813bc0
commit
67feccd3ba
|
@ -95,6 +95,20 @@ subtree[=<path>];;
|
|||
is prefixed (or stripped from the beginning) to make the shape of
|
||||
two trees to match.
|
||||
|
||||
ort::
|
||||
This is meant as a drop-in replacement for the `recursive`
|
||||
algorithm (as reflected in its acronym -- "Ostensibly
|
||||
Recursive's Twin"), and will likely replace it in the future.
|
||||
It fixes corner cases that the `recursive` strategy handles
|
||||
suboptimally, and is significantly faster in large
|
||||
repositories -- especially when many renames are involved.
|
||||
+
|
||||
The `ort` strategy takes all the same options as `recursive`.
|
||||
However, it ignores three of those options: `no-renames`,
|
||||
`patience` and `diff-algorithm`. It always runs with rename
|
||||
detection (it handles it much faster than `recursive` does), and
|
||||
it specifically uses `diff-algorithm=histogram`.
|
||||
|
||||
resolve::
|
||||
This can only resolve two heads (i.e. the current branch
|
||||
and another branch you pulled from) using a 3-way merge
|
||||
|
|
Loading…
Reference in a new issue