summaryrefslogtreecommitdiff
path: root/Documentation/merge-options.txt
diff options
context:
space:
mode:
authorMarc Branchaud <marcnarc@xiplink.com>2010-04-12 16:28:13 (GMT)
committerJunio C Hamano <gitster@pobox.com>2010-04-12 16:50:09 (GMT)
commitadda3c3beb0a244719becb1895e16227b0393bd1 (patch)
tree44b3268ee1379eddabd91fae67c1e71377659fae /Documentation/merge-options.txt
parentfcd424011bf7b841e9d4b3154ecadf6bf5e6e686 (diff)
downloadgit-adda3c3beb0a244719becb1895e16227b0393bd1.zip
git-adda3c3beb0a244719becb1895e16227b0393bd1.tar.gz
git-adda3c3beb0a244719becb1895e16227b0393bd1.tar.bz2
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>
Diffstat (limited to 'Documentation/merge-options.txt')
-rw-r--r--Documentation/merge-options.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index 3b83dba..81ac823 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -62,6 +62,11 @@ option can be used to override --squash.
is used instead ('git merge-recursive' when merging a single
head, 'git merge-octopus' otherwise).
+-X <option>::
+--strategy-option=<option>::
+ Pass merge strategy specific option through to the merge
+ strategy.
+
--summary::
--no-summary::
Synonyms to --stat and --no-stat; these are deprecated and will be
@@ -74,8 +79,3 @@ option can be used to override --squash.
-v::
--verbose::
Be verbose.
-
--X <option>::
---strategy-option=<option>::
- Pass merge strategy specific option through to the merge
- strategy.