Merge branch 'vd/doc-merge-tree-x-option'

Doc update. * vd/doc-merge-tree-x-option: Documentation/git-merge-tree.txt: document -X
2024-05-15 09:52:54 -07:00 · 2024-05-15 09:52:54 -07:00 · 754ae50219
parent 068df18c90 2566a77774
commit 754ae50219
1 changed files with 5 additions and 0 deletions
--- 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
 ------