mirrors/git
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'vd/doc-merge-tree-x-option' into maint-2.45

Browse Source 
Doc update.

* vd/doc-merge-tree-x-option:
  Documentation/git-merge-tree.txt: document -X
This commit is contained in:
Junio C Hamano
2024-06-28 15:53:11 -07:00
parent 0d23421e2a 2566a77774
commit abfdc596d8
1 changed files with 5 additions and 0 deletions
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
------ ------