]> git.ipfire.org Git - thirdparty/git.git/commitdiff
projects / thirdparty / git.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f639955 1c573a3)
Merge branch 'en/doc-merge-tree-describe-merge-base' into next next
authorJunio C Hamano <gitster@pobox.com>
Mon, 6 Oct 2025 21:31:51 +0000 (14:31 -0700)
committerJunio C Hamano <gitster@pobox.com>
Mon, 6 Oct 2025 21:31:51 +0000 (14:31 -0700)
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

1  2 
Documentation/git-merge-tree.adoc patch | diff1 | diff2 | blob | history

diff --cc Documentation/git-merge-tree.adoc
Simple merge
Unnamed repository; edit this file 'description' to name the repository.