[PATCH] Docs: Add -X option to git-merge's synopsis.
- From
Marc Branchaud <marcnarc@xiplink.com>
- Date
- Apr 12, 2010, 16:28 UTC
- 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 <strategy>]... +'git merge' [-n] [--stat] [--no-commit] [--squash]... + [-s <strategy>] [-X <strategy-option>]... [--[no-]rerere-autoupdate] [-m <msg>] <commit>... 'git merge' <msg> HEAD <commit>... 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 <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 @@ -76,8 +81,3 @@ ifndef::git-pull[] --verbose:: Be verbose. endif::git-pull[] - --X <option>:: ---strategy-option=<option>:: - Pass merge strategy specific option through to the merge - strategy.
-- 1.7.1.rc0