Documentation/git-merge-tree.txt: document -X

Add a documentation entry for -X/--strategy-option in '--merge-tree', including a link to the 'git-merge' documentation with more details on which strategy options are available and what they do. Signed-off-by: Victoria Dye <[email protected]>
vdye · May 7, 2024 · 6d4a10c · 6d4a10c
1 parent d4cc1ec
commit 6d4a10c
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
@@ -72,6 +72,11 @@ OPTIONS
 As the merge-base is provided directly, <branch1> and <branch2> do not need
 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
 ------