diff options
| author | Elijah Newren <newren@gmail.com> | 2025-04-08 15:48:40 +0000 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2025-04-08 13:59:13 -0700 |
| commit | ad45b327c0a13718ed5955319d1e735025676cc8 (patch) | |
| tree | d00677c0c8a51ee271789428c13650d92418e4a0 /Documentation/technical/sparse-checkout.adoc | |
| parent | 75cd9ae05fbc9d3e9ccbd8923f4fad76b3ec609f (diff) | |
| download | git-ad45b327c0a13718ed5955319d1e735025676cc8.tar.gz | |
merge-recursive.[ch]: thoroughly debug these
As a wise man once told me, "Deleted code is debugged code!" So, move
the functions that are shared between merge-recursive and merge-ort from
the former to the latter, and then debug the remainder of
merge-recursive.[ch].
Joking aside, merge-ort was always intended to replace merge-recursive.
It has numerous advantages over merge-recursive (operates much faster,
can operate without a worktree or index, and fixes a number of known
bugs and suboptimal merges). Since we have now replaced all callers of
merge-recursive with equivalent functions from merge-ort, move the
shared functions from the former to the latter, and delete the remainder
of merge-recursive.[ch].
Signed-off-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'Documentation/technical/sparse-checkout.adoc')
| -rw-r--r-- | Documentation/technical/sparse-checkout.adoc | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Documentation/technical/sparse-checkout.adoc b/Documentation/technical/sparse-checkout.adoc index d968659354..dc2e763bbe 100644 --- a/Documentation/technical/sparse-checkout.adoc +++ b/Documentation/technical/sparse-checkout.adoc @@ -356,8 +356,6 @@ understanding these differences can be beneficial. The behavior for these commands somewhat depends upon the merge strategy being used: * `ort` behaves as described above - * `recursive` tries to not vivify files unnecessarily, but does sometimes - vivify files without conflicts. * `octopus` and `resolve` will always vivify any file changed in the merge relative to the first parent, which is rather suboptimal. |