merge-strategies.txt: do not imply using copy detection is desired
Stating that the recursive strategy "currently cannot make use of detected copies" implies that this is a technical shortcoming of the current algorithm. I disagree with that. I don't see how copies could possibly be used in a sane fashion in a merge algorithm -- would we propagate changes in one file on one side of history to each copy of that file when merging? That makes no sense to me. I cannot think of anything else that would make sense either. Change the wording to simply state that we ignore any copies. 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
002a6dfc7c4642524d1e82f8cf994fc9ea5786f9
1 file changed
+3
-3
Documentation/merge-strategies.txt
+3
-3
@@ -16,9 +16,9 @@ recursive::
16
causing mismerges by tests done on actual merge commits
17
taken from Linux 2.6 kernel development history.
18
Additionally this can detect and handle merges involving
19
- renames, but currently cannot make use of detected
20
- copies. This is the default merge strategy when pulling
21
- or merging one branch.
19
+ renames. It does not make use of detected copies. This
20
+ is the default merge strategy when pulling or merging one
21
+ branch.
22
+
23
The 'recursive' strategy can take the following options:
24