Skip to content

Commit 2566a77

Browse files
vdyegitster
authored andcommitted
Documentation/git-merge-tree.txt: document -X
Add an entry in the 'merge-tree' builtin documentation for -X/--strategy-option (added in 6a4c9e7 (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 <[email protected]> Signed-off-by: Junio C Hamano <[email protected]>
1 parent 786a3e4 commit 2566a77

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

Documentation/git-merge-tree.txt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,11 @@ OPTIONS
7272
As the merge-base is provided directly, <branch1> and <branch2> do not need
7373
to specify commits; trees are enough.
7474

75+
-X<option>::
76+
--strategy-option=<option>::
77+
Pass the merge strategy-specific option through to the merge strategy.
78+
See linkgit:git-merge[1] for details.
79+
7580
[[OUTPUT]]
7681
OUTPUT
7782
------

0 commit comments

Comments
 (0)