summaryrefslogtreecommitdiff
path: root/Documentation/git-merge.txt
diff options
context:
space:
mode:
authorMarc Branchaud <marcnarc@xiplink.com>2010-04-12 12:28:13 -0400
committerJunio C Hamano <gitster@pobox.com>2010-04-12 09:50:09 -0700
commitadda3c3beb0a244719becb1895e16227b0393bd1 (patch)
tree44b3268ee1379eddabd91fae67c1e71377659fae /Documentation/git-merge.txt
parentfcd424011bf7b841e9d4b3154ecadf6bf5e6e686 (diff)
downloadgit-adda3c3beb0a244719becb1895e16227b0393bd1.tar.gz
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/git-merge.txt')
-rw-r--r--Documentation/git-merge.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index 9c9618cead..c2325ef90e 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -9,7 +9,8 @@ git-merge - Join two or more development histories together
SYNOPSIS
--------
[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>...
'git merge' <msg> HEAD <commit>...