From: Junio C Hamano Date: Fri, 26 Feb 2021 00:43:31 +0000 (-0800) Subject: Merge branch 'ds/merge-base-independent' X-Git-Tag: v2.31.0-rc0~8 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=48923e83568caa631968b39fd99a75389be0a982;p=thirdparty%2Fgit.git 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() --- 48923e83568caa631968b39fd99a75389be0a982