Docs: Add -X option to git-merge's synopsis.
Also move -X's description next to -s's in merge-options.txt. This makes it easier to learn how to specify merge strategy options. Signed-off-by: Junio C Hamano <gitster@pobox.com>
This commit is contained in:
parent
fcd424011b
commit
adda3c3beb
@ -9,7 +9,8 @@ git-merge - Join two or more development histories together
|
|||||||
SYNOPSIS
|
SYNOPSIS
|
||||||
--------
|
--------
|
||||||
[verse]
|
[verse]
|
||||||
'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
|
'git merge' [-n] [--stat] [--no-commit] [--squash]
|
||||||
|
[-s <strategy>] [-X <strategy-option>]
|
||||||
[--[no-]rerere-autoupdate] [-m <msg>] <commit>...
|
[--[no-]rerere-autoupdate] [-m <msg>] <commit>...
|
||||||
'git merge' <msg> HEAD <commit>...
|
'git merge' <msg> HEAD <commit>...
|
||||||
|
|
||||||
|
@ -62,6 +62,11 @@ option can be used to override --squash.
|
|||||||
is used instead ('git merge-recursive' when merging a single
|
is used instead ('git merge-recursive' when merging a single
|
||||||
head, 'git merge-octopus' otherwise).
|
head, 'git merge-octopus' otherwise).
|
||||||
|
|
||||||
|
-X <option>::
|
||||||
|
--strategy-option=<option>::
|
||||||
|
Pass merge strategy specific option through to the merge
|
||||||
|
strategy.
|
||||||
|
|
||||||
--summary::
|
--summary::
|
||||||
--no-summary::
|
--no-summary::
|
||||||
Synonyms to --stat and --no-stat; these are deprecated and will be
|
Synonyms to --stat and --no-stat; these are deprecated and will be
|
||||||
@ -74,8 +79,3 @@ option can be used to override --squash.
|
|||||||
-v::
|
-v::
|
||||||
--verbose::
|
--verbose::
|
||||||
Be verbose.
|
Be verbose.
|
||||||
|
|
||||||
-X <option>::
|
|
||||||
--strategy-option=<option>::
|
|
||||||
Pass merge strategy specific option through to the merge
|
|
||||||
strategy.
|
|
||||||
|
Loading…
Reference in New Issue
Block a user