mirror of
https://github.com/git/git
synced 2024-10-05 16:19:28 +00:00
Merge branch 'vd/doc-merge-tree-x-option'
Doc update. * vd/doc-merge-tree-x-option: Documentation/git-merge-tree.txt: document -X
This commit is contained in:
commit
754ae50219
|
@ -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
|
||||||
------
|
------
|
||||||
|
|
Loading…
Reference in a new issue