]> git.99rst.org Git - git.git/commitdiff
git.99rst.org / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ab09edd 4ebba56)
Merge branch 'lo/doc-merge-submodule-update'
authorJunio C Hamano <redacted>
Mon, 3 Mar 2025 16:53:02 +0000 (08:53 -0800)
committerJunio C Hamano <redacted>
Mon, 3 Mar 2025 16:53:02 +0000 (08:53 -0800)
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


Trivial merge
git clone https://git.99rst.org/PROJECT