From: Marc Branchaud Date: Mon, 12 Apr 2010 16:28:13 GMT Subject: [PATCH] Docs: Add -X option to git-merge's synopsis. Message-ID: <1271089693-21365-1-git-send-email-marcnarc@xiplink.com> 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. --- Had to specify a merge strategy option today, and it took a little too much work to figure out how. Documentation/git-merge.txt | 3 ++- Documentation/merge-options.txt | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt index 9c9618c..ceec787 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 ]... +'git merge' [-n] [--stat] [--no-commit] [--squash]... + [-s ] [-X ]... [--[no-]rerere-autoupdate] [-m ] ... 'git merge' HEAD ... diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt index 37ce9a1..722d704 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