]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 5d9c934) | patch
sparse-index: integrate with cherry-pick and rebase
authorDerrick Stolee <dstolee@microsoft.com>
Wed, 8 Sep 2021 11:24:01 +0000 (11:24 +0000)
committerJunio C Hamano <gitster@pobox.com>
Thu, 9 Sep 2021 22:49:05 +0000 (15:49 -0700)
commit516680ba7704c473bb21628aa19cabbd787df4db
treed934e2d0337a272150524ae6b30e4bc6c27b72dctree | snapshot
parent5d9c9349bd0acda149f37eb1c5edc2a5ef747eeacommit | diff
sparse-index: integrate with cherry-pick and rebase

The hard work was already done with 'git merge' and the ORT strategy.
Just add extra tests to see that we get the expected results in the
non-conflict cases.

Signed-off-by: Derrick Stolee <dstolee@microsoft.com>
Reviewed-by: Elijah Newren <newren@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
builtin/rebase.c diff | blob | blame | history
builtin/revert.c diff | blob | blame | history
t/t1092-sparse-checkout-compatibility.sh diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.