From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 3 Mar 2025 16:53:02 +0000 (-0800)
Subject: Merge branch 'lo/doc-merge-submodule-update'
X-Git-Tag: v2.49.0-rc1~5
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=238c8d3984fc38d10a257c0972f142793ae5af96;p=thirdparty%2Fgit.git

Merge branch 'lo/doc-merge-submodule-update'

What happens to submodules during merge has been documented in a
bit more detail.

* lo/doc-merge-submodule-update:
  merge-strategies.adoc: detail submodule merge
---

238c8d3984fc38d10a257c0972f142793ae5af96