Skip to content

Commit d4d57ba

Browse files
newrenderrickstolee
authored andcommitted
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. Signed-off-by: Elijah Newren <[email protected]>
1 parent 6d75e85 commit d4d57ba

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

Documentation/merge-strategies.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,9 @@ recursive::
1616
causing mismerges by tests done on actual merge commits
1717
taken from Linux 2.6 kernel development history.
1818
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.
2222
+
2323
The 'recursive' strategy can take the following options:
2424

0 commit comments

Comments
 (0)