mirror of
https://github.com/git/git
synced 2024-08-25 02:35:46 +00:00
merge-strategies.txt: avoid giving special preference to patience algorithm
We already have diff-algorithm that explains why there are special diff algorithms, so we do not need to re-explain patience. patience exists as its own toplevel option for historical reasons, but there's no reason to give it special preference or document it again and suggest it's more important than other diff algorithms, so just refer to it as a deprecated shorthand for `diff-algorithm=patience`. 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
002a6dfc7c
commit
4d15c85556
|
@ -37,11 +37,7 @@ theirs;;
|
|||
no 'theirs' merge strategy to confuse this merge option with.
|
||||
|
||||
patience;;
|
||||
With this option, 'merge-recursive' spends a little extra time
|
||||
to avoid mismerges that sometimes occur due to unimportant
|
||||
matching lines (e.g., braces from distinct functions). Use
|
||||
this when the branches to be merged have diverged wildly.
|
||||
See also linkgit:git-diff[1] `--patience`.
|
||||
Deprecated synonym for `diff-algorithm=patience`.
|
||||
|
||||
diff-algorithm=[patience|minimal|histogram|myers];;
|
||||
Use a different diff algorithm while merging, which can help
|
||||
|
|
Loading…
Reference in a new issue