]> git.ipfire.org Git - thirdparty/git.git/commitdiff
Merge branch 'vd/doc-merge-tree-x-option' into maint-2.45
authorJunio C Hamano <gitster@pobox.com>
Fri, 28 Jun 2024 22:53:11 +0000 (15:53 -0700)
committerJunio C Hamano <gitster@pobox.com>
Fri, 28 Jun 2024 22:53:11 +0000 (15:53 -0700)
Doc update.

* vd/doc-merge-tree-x-option:
  Documentation/git-merge-tree.txt: document -X


Trivial merge