]> git.ipfire.org Git - thirdparty/git.git/commit
projects / thirdparty / git.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 786a3e4) | patch
Documentation/git-merge-tree.txt: document -X
authorVictoria Dye <vdye@github.com>
Tue, 7 May 2024 21:36:29 +0000 (21:36 +0000)
committerJunio C Hamano <gitster@pobox.com>
Tue, 7 May 2024 22:36:08 +0000 (15:36 -0700)
commit2566a777747051eaeaaf90f3dc93bf84d2c2edeb
tree6e3e6c976f28490a9b21a2317f9b423ec15f58a8tree | snapshot
parent786a3e4b8d754d2b14b1208b98eeb0a554ef19a8commit | diff
Documentation/git-merge-tree.txt: document -X

Add an entry in the 'merge-tree' builtin documentation for
-X/--strategy-option (added in 6a4c9e7b32 (merge-tree: add -X strategy
option, 2023-09-24)). The same option is documented for 'merge', 'rebase',
'revert', etc. in their respective Documentation/ files, so let's do the
same for 'merge-tree'.

Signed-off-by: Victoria Dye <vdye@github.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-merge-tree.txt diff | blob | blame | history
Unnamed repository; edit this file 'description' to name the repository.