diff options
| author |  Elijah Newren <newren@gmail.com> | 2021-08-04 23:50:49 +0000 |
|---|---|---|
| committer |  Junio C Hamano <gitster@pobox.com> | 2021-08-05 08:57:40 -0700 |
| commit | 002a6dfc7c4642524d1e82f8cf994fc9ea5786f9 (patch) | |
| tree | 9b244d002f6d5e536ec673a0d20d09d248fa4fd2 | |
| parent | merge-strategies.txt: update wording for the resolve strategy (diff) | |
| download | tgif-002a6dfc7c4642524d1e82f8cf994fc9ea5786f9.tar.xz | |
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>
| -rw-r--r-- | Documentation/merge-strategies.txt | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/merge-strategies.txt b/Documentation/merge-strategies.txt index f100fad1e4..e298812458 100644 --- a/Documentation/merge-strategies.txt +++ b/Documentation/merge-strategies.txt @@ -16,9 +16,9 @@ recursive:: causing mismerges by tests done on actual merge commits taken from Linux 2.6 kernel development history. Additionally this can detect and handle merges involving - renames, but currently cannot make use of detected - copies. This is the default merge strategy when pulling - or merging one branch. + renames. It does not make use of detected copies. This + is the default merge strategy when pulling or merging one + branch. + The 'recursive' strategy can take the following options: |