| commit | 48923e83568caa631968b39fd99a75389be0a982 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 Feb 2021 00:43:31 +0000 (25 16:43 -0800) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 26 Feb 2021 00:43:31 +0000 (25 16:43 -0800) | ||
| tree | 0d1b98afea54ee65d9c8a6ed824b9572e5246e8e | treesnapshot (tar.gz zip) |
| parent | 682bbad64d9afd438d9b293c18331c1018672fee | commitdiff |
| parent | 41f3c9949fc384f6a122e7d23bc36b7d9bb96ce2 | commitdiff |
Merge branch 'ds/merge-base-independent'
The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
* ds/merge-base-independent:
commit-reach: stale commits may prune generation further
commit-reach: use heuristic in remove_redundant()
commit-reach: move compare_commits_by_gen
commit-reach: use one walk in remove_redundant()
commit-reach: reduce requirements for remove_redundant()
The code to implement "git merge-base --independent" was poorly
done and was kept from the very beginning of the feature.
* ds/merge-base-independent:
commit-reach: stale commits may prune generation further
commit-reach: use heuristic in remove_redundant()
commit-reach: move compare_commits_by_gen
commit-reach: use one walk in remove_redundant()
commit-reach: reduce requirements for remove_redundant()