From 6d4a10c6acefdf4fa904df823276ab01cbf3270b Mon Sep 17 00:00:00 2001
From: Victoria Dye <vdye@github.com>
Date: Tue, 7 May 2024 13:53:56 -0700
Subject: [PATCH] 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 <vdye@github.com>
---
 Documentation/git-merge-tree.txt | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Documentation/git-merge-tree.txt b/Documentation/git-merge-tree.txt
index dd388fa21d5a51..84cb2edf6d0922 100644
--- 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
 ------