kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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>
maint
Victoria Dye 2024-05-07 21:36:29 +00:00 committed by Junio C Hamano
parent 786a3e4b8d
commit 2566a77774
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-merge-tree.txt
View File

@ -72,6 +72,11 @@ OPTIONS
As the merge-base is provided directly, <branch1> and <branch2> do not need As the merge-base is provided directly, <branch1> and <branch2> do not need
to specify commits; trees are enough. to specify commits; trees are enough.


-X<option>::
--strategy-option=<option>::
Pass the merge strategy-specific option through to the merge strategy.
See linkgit:git-merge[1] for details.

[[OUTPUT]] [[OUTPUT]]
OUTPUT OUTPUT
------ ------