| commit | 4d15c85556891bfdddfb90b6be056b08079696bb | |
| author | Elijah Newren <newren@gmail.com> | |
| Wed, 4 Aug 2021 23:50:50 +0000 (4 23:50 +0000) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Thu, 5 Aug 2021 15:57:40 +0000 (5 08:57 -0700) | ||
| tree | d99a23bc444d104e24c6fd7cdea56cb2dacafc8f | treesnapshot (tar.gz zip) |
| parent | 002a6dfc7c4642524d1e82f8cf994fc9ea5786f9 | commitdiff |
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>
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>
| Documentation/merge-strategies.txt | diffblobblamehistory |