From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 6 Oct 2025 21:31:51 +0000 (-0700)
Subject: Merge branch 'en/doc-merge-tree-describe-merge-base' into next
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fheads%2Fnext;p=thirdparty%2Fgit.git

Merge branch 'en/doc-merge-tree-describe-merge-base' into next

Clarify the "--merge-base" command line option in "git merge-tree".

* en/doc-merge-tree-describe-merge-base:
  Documentation/git-merge-tree.adoc: clarify the --merge-base option
---

787ff6f08aa94a0b11d31482879f7efece126361