[PATCH] Documentation/*merge*.txt: Order options alphabetically

[PATCH] Documentation/*merge*.txt: Order options alphabetically

[jari.aalto]

From: Jari Aalto <jari.aalto@cante.net>

In git-merge.txt, define asciidoc variable to flag processing in
merge-options.txt. Move all options from git-merge.txt to
merge-options.txt so that that options can be presented in
alphabetical order.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Documentation/git-merge.txt     |   19 +----------
 Documentation/merge-options.txt |   66 +++++++++++++++++++++++++-------------
 2 files changed, 45 insertions(+), 40 deletions(-)

diff --git a/Documentation/git-merge.txt b/Documentation/git-merge.txt
index d43416d..4a62d36 100644
--- a/Documentation/git-merge.txt
+++ b/Documentation/git-merge.txt
@@ -51,26 +51,11 @@ new scripts.  It is the same as `git merge -m <msg> <commit>...`.
 discouraged: while possible, it leaves you in a state that is hard to
 back out of in the case of a conflict.
 
-
 OPTIONS
 -------
-include::merge-options.txt[]
 
--m <msg>::
-	Set the commit message to be used for the merge commit (in
-	case one is created).
-+
-If `--log` is specified, a shortlog of the commits being merged
-will be appended to the specified message.
-+
-The 'git fmt-merge-msg' command can be
-used to give a good default for automated 'git merge'
-invocations.
-
---rerere-autoupdate::
---no-rerere-autoupdate::
-	Allow the rerere mechanism to update the index with the
-	result of auto-conflict resolution if possible.
+:git-merge: 1
+include::merge-options.txt[]
 
 <commit>...::
 	Commits, usually other branch heads, to merge into our branch.
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index e33e0f8..29aef16 100644
--- a/Documentation/merge-options.txt
+++ b/Documentation/merge-options.txt
@@ -16,6 +16,11 @@ inspect and further tweak the merge result before committing.
 With --no-ff Generate a merge commit even if the merge
 resolved as a fast-forward.
 
+--ff-only::
+	Refuse to merge and exit with a non-zero status unless the
+	current `HEAD` is already up-to-date or the merge can be
+	resolved as a fast-forward.
+
 --log[=<n>]::
 --no-log::
 	In addition to branch names, populate the log message with
@@ -25,6 +30,38 @@ resolved as a fast-forward.
 With --no-log do not list one-line descriptions from the
 actual commits being merged.
 
+ifdef::git-merge[]
+-m <msg>::
+	Set the commit message to be used for the merge commit (in
+	case one is created).
++
+If `--log` is specified, a shortlog of the commits being merged
+will be appended to the specified message.
++
+The 'git fmt-merge-msg' command can be
+used to give a good default for automated 'git merge'
+invocations.
+endif::git-merge[]
+
+ifndef::git-pull[]
+-q::
+--quiet::
+	Operate quietly.
+
+ifdef::git-merge[]
+--rerere-autoupdate::
+--no-rerere-autoupdate::
+	Allow the rerere mechanism to update the index with the
+	result of auto-conflict resolution if possible.
+endif::git-merge[]
+
+-s <strategy>::
+--strategy=<strategy>::
+	Use the given merge strategy; can be supplied more than
+	once to specify them in the order they should be tried.
+	If there is no `-s` option, a built-in list of strategies
+	is used instead ('git merge-recursive' when merging a single
+	head, 'git merge-octopus' otherwise).
 
 --stat::
 -n::
@@ -49,35 +86,18 @@ merge.
 With --no-squash perform the merge and commit the result. This
 option can be used to override --squash.
 
---ff-only::
-	Refuse to merge and exit with a non-zero status unless the
-	current `HEAD` is already up-to-date or the merge can be
-	resolved as a fast-forward.
-
--s <strategy>::
---strategy=<strategy>::
-	Use the given merge strategy; can be supplied more than
-	once to specify them in the order they should be tried.
-	If there is no `-s` option, a built-in list of strategies
-	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
 	removed in the future.
 
-ifndef::git-pull[]
--q::
---quiet::
-	Operate quietly.
-
 -v::
 --verbose::
 	Be verbose.
 endif::git-pull[]
+
+-X <option>::
+--strategy-option=<option>::
+	Pass merge strategy specific option through to the merge
+	strategy.
+
-- 
1.7.2.3