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>
Elijah Newren committed
Aug 4, 2021 at 23:50 UTC
4d15c85556891bfdddfb90b6be056b08079696bb
1 file changed
+1
-5
Documentation/merge-strategies.txt
+1
-5
@@ -37,11 +37,7 @@ theirs;;
37
no 'theirs' merge strategy to confuse this merge option with.
38
39
patience;;
40
- With this option, 'merge-recursive' spends a little extra time
41
- to avoid mismerges that sometimes occur due to unimportant
42
- matching lines (e.g., braces from distinct functions). Use
43
- this when the branches to be merged have diverged wildly.
44
- See also linkgit:git-diff[1] `--patience`.
40
+ Deprecated synonym for `diff-algorithm=patience`.
41
42
diff-algorithm=[patience|minimal|histogram|myers];;
43
Use a different diff algorithm while merging, which can help