[PATCH] git-pull.txt, merge-options.txt: order options alphabetically

[PATCH] git-pull.txt, merge-options.txt: order options alphabetically

[jari.aalto]

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

Remove idndef from merge-options.txt because only two generic -q nad
-v options were used. Simplify git-pull.txt by dropping dependency on
merge-options.txt and copy definitions of -q and -v in order to list
all comman generic options in alphabetical order.

Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Documentation/git-pull.txt      |   14 ++++++++----
 Documentation/merge-options.txt |   44 ++++++++++++++++++--------------------
 2 files changed, 30 insertions(+), 28 deletions(-)

diff --git a/Documentation/git-pull.txt b/Documentation/git-pull.txt
index e47361f..1648237 100644
--- a/Documentation/git-pull.txt
+++ b/Documentation/git-pull.txt
@@ -87,11 +87,12 @@ must be given before the options meant for 'git fetch'.
 Options related to merging
 ~~~~~~~~~~~~~~~~~~~~~~~~~~
 
-include::merge-options.txt[]
-
-:git-pull: 1
+-q::
+--quiet::
+	Operate quietly.
 
 --rebase::
+--no-rebase::
 	Rebase the current branch on top of the upstream branch after
 	fetching.  If there is a remote-tracking branch corresponding to
 	the upstream branch and the upstream branch was rebased since last
@@ -107,8 +108,11 @@ It rewrites history, which does not bode well when you
 published that history already.  Do *not* use this option
 unless you have read linkgit:git-rebase[1] carefully.
 
---no-rebase::
-	Override earlier --rebase.
+	With `--no-rebase' Override earlier `--rebase'.
+
+-v::
+--verbose::
+	Be verbose.
 
 Options related to fetching
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~
diff --git a/Documentation/merge-options.txt b/Documentation/merge-options.txt
index e33e0f8..684b7be 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,15 +30,9 @@ resolved as a fast-forward.
 With --no-log do not list one-line descriptions from the
 actual commits being merged.
 
-
---stat::
--n::
---no-stat::
-	Show a diffstat at the end of the merge. The diffstat is also
-	controlled by the configuration option merge.stat.
-+
-With -n or --no-stat do not show a diffstat at the end of the
-merge.
+-q::
+--quiet::
+	Operate quietly.
 
 --squash::
 --no-squash::
@@ -49,11 +48,6 @@ 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
@@ -62,22 +56,26 @@ 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.
+--stat::
+-n::
+--no-stat::
+	Show a diffstat at the end of the merge. The diffstat is also
+	controlled by the configuration option merge.stat.
++
+With -n or --no-stat do not show a diffstat at the end of the
+merge.
 
 --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.
+-X <option>::
+--strategy-option=<option>::
+	Pass merge strategy specific option through to the merge
+	strategy.
 
 -v::
 --verbose::
 	Be verbose.
-endif::git-pull[]
+
-- 
1.7.2.3