From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 27 May 2026 05:15:44 +0000 (+0900)
Subject: Merge branch 'kk/merge-octopus-optim'
X-Git-Tag: v2.55.0-rc0~51
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=9020a116d63828a9bd521564d9d41b2c0136e6d2;p=thirdparty%2Fgit.git

Merge branch 'kk/merge-octopus-optim'

The logic to determine that branches in an octopus merge are
independent has been optimized.

* kk/merge-octopus-optim:
  merge: use repo_in_merge_bases for octopus up-to-date check
---

9020a116d63828a9bd521564d9d41b2c0136e6d2