| commit | abfdc596d871e8b437c7ae9ac5184eb836ba1a77 | |
| author | Junio C Hamano <gitster@pobox.com> | |
| Fri, 28 Jun 2024 22:53:11 +0000 (28 15:53 -0700) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 28 Jun 2024 22:53:11 +0000 (28 15:53 -0700) | ||
| tree | b365e5ea6d6d3f18193eb4680ffa40fb59da6a3f | treesnapshot (tar.gz zip) |
| parent | 0d23421e2a30fb15c5b701c36a2c7b37b9aec58a | commitdiff |
| parent | 2566a777747051eaeaaf90f3dc93bf84d2c2edeb | commitdiff |
Merge branch 'vd/doc-merge-tree-x-option' into maint-2.45
Doc update.
* vd/doc-merge-tree-x-option:
Documentation/git-merge-tree.txt: document -X
Doc update.
* vd/doc-merge-tree-x-option:
Documentation/git-merge-tree.txt: document -X