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>
Marc Branchaud committed
Apr 12, 2010 at 12:28 UTC
adda3c3beb0a244719becb1895e16227b0393bd1
2 files changed
+7
-6
Documentation/git-merge.txt
+2
-1
@@ -9,7 +9,8 @@ git-merge - Join two or more development histories together
9
SYNOPSIS
10
--------
11
[verse]
12
-'git merge' [-n] [--stat] [--no-commit] [--squash] [-s <strategy>]...
12
+'git merge' [-n] [--stat] [--no-commit] [--squash]
13
+ [-s <strategy>] [-X <strategy-option>]
14
[--[no-]rerere-autoupdate] [-m <msg>] <commit>...
15
'git merge' <msg> HEAD <commit>...
16
Documentation/merge-options.txt
+5
-5
@@ -62,6 +62,11 @@ option can be used to override --squash.
62
is used instead ('git merge-recursive' when merging a single
63
head, 'git merge-octopus' otherwise).
64
65
+-X <option>::
66
+--strategy-option=<option>::
67
+ Pass merge strategy specific option through to the merge
68
+ strategy.
69
+
70
--summary::
71
--no-summary::
72
Synonyms to --stat and --no-stat; these are deprecated and will be
@@ -74,8 +79,3 @@ option can be used to override --squash.
79
-v::
80
--verbose::
81
Be verbose.
77
-
78
--X <option>::
79
---strategy-option=<option>::
80
- Pass merge strategy specific option through to the merge
81
- strategy.