[PATCH] git-config.txt: Order options alphabetically

[jari.aalto@cante.net]

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


Signed-off-by: Jari Aalto <jari.aalto@cante.net>
---
 Documentation/git-config.txt |  121 +++++++++++++++++++++---------------------
 1 files changed, 60 insertions(+), 61 deletions(-)

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 543dd64..baeeebc 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -64,15 +64,27 @@ This command will fail if:
 OPTIONS
 -------
 
---replace-all::
-	Default behavior is to replace at most one line. This replaces
-	all lines matching the key (and optionally the value_regex).
-
 --add::
 	Adds a new line to the option without altering any existing
 	values.  This is the same as providing '^$' as the value_regex
 	in `--replace-all`.
 
+-e::
+--edit::
+	Opens an editor to modify the specified config file; either
+	'--system', '--global', or repository (default).
+
+--bool::
+	'git config' will ensure that the output is "true" or "false"
+
+--bool-or-int::
+	'git config' will ensure that the output matches the format of
+	either --bool or --int, as described above.
+
+-f config-file::
+--file config-file::
+	Use the given config file instead of the one specified by GIT_CONFIG.
+
 --get::
 	Get the value for a given key (optionally filtered by a regex
 	matching the value). Returns error code 1 if the key was not
@@ -82,6 +94,23 @@ OPTIONS
 	Like get, but does not fail if the number of values for the key
 	is not exactly one.
 
+--get-color name [default]::
+
+	Find the color configured for `name` (e.g. `color.diff.new`) and
+	output it as the ANSI color escape sequence to the standard
+	output.  The optional `default` parameter is used instead, if
+	there is no color configured for `name`.
+
+--get-colorbool name [stdout-is-tty]::
+	Find the color setting for `name` (e.g. `color.diff`) and output
+	"true" or "false".  `stdout-is-tty` should be either "true" or
+	"false", and is taken into account when configuration says
+	"auto".  If `stdout-is-tty` is missing, then checks the standard
+	output of the command itself, and exits with status 0 if color
+	is to be used, or exits with status 1 otherwise.
+	When the color setting for `name` is undefined, the command uses
+	`color.ui` as fallback.
+
 --get-regexp::
 	Like --get-all, but interprets the name as a regular expression.
 	Also outputs the key names.
@@ -95,6 +124,33 @@ from all available files.
 +
 See also <<FILES>>.
 
+--int::
+	'git config' will ensure that the output is a simple
+	decimal number.  An optional value suffix of 'k', 'm', or 'g'
+	in the config file will cause the value to be multiplied
+	by 1024, 1048576, or 1073741824 prior to output.
+
+-l::
+--list::
+	List all variables set in config file.
+
+--path::
+	'git-config' will expand leading '{tilde}' to the value of
+	'$HOME', and '{tilde}user' to the home directory for the
+	specified user.  This option has no effect when setting the
+	value (but you can use 'git config bla {tilde}/' from the
+	command line to let your shell do the expansion).
+
+--remove-section::
+	Remove the given section from the configuration file.
+
+--rename-section::
+	Rename the given section to a new name.
+
+--replace-all::
+	Default behavior is to replace at most one line. This replaces
+	all lines matching the key (and optionally the value_regex).
+
 --system::
 	For writing options: write to system-wide $(prefix)/etc/gitconfig
 	rather than the repository .git/config.
@@ -104,46 +160,12 @@ rather than from all available files.
 +
 See also <<FILES>>.
 
--f config-file::
---file config-file::
-	Use the given config file instead of the one specified by GIT_CONFIG.
-
---remove-section::
-	Remove the given section from the configuration file.
-
---rename-section::
-	Rename the given section to a new name.
-
 --unset::
 	Remove the line matching the key from config file.
 
 --unset-all::
 	Remove all lines matching the key from config file.
 
--l::
---list::
-	List all variables set in config file.
-
---bool::
-	'git config' will ensure that the output is "true" or "false"
-
---int::
-	'git config' will ensure that the output is a simple
-	decimal number.  An optional value suffix of 'k', 'm', or 'g'
-	in the config file will cause the value to be multiplied
-	by 1024, 1048576, or 1073741824 prior to output.
-
---bool-or-int::
-	'git config' will ensure that the output matches the format of
-	either --bool or --int, as described above.
-
---path::
-	'git-config' will expand leading '{tilde}' to the value of
-	'$HOME', and '{tilde}user' to the home directory for the
-	specified user.  This option has no effect when setting the
-	value (but you can use 'git config bla {tilde}/' from the
-	command line to let your shell do the expansion).
-
 -z::
 --null::
 	For all options that output values and/or keys, always
@@ -153,29 +175,6 @@ See also <<FILES>>.
 	output without getting confused e.g. by values that
 	contain line breaks.
 
---get-colorbool name [stdout-is-tty]::
-
-	Find the color setting for `name` (e.g. `color.diff`) and output
-	"true" or "false".  `stdout-is-tty` should be either "true" or
-	"false", and is taken into account when configuration says
-	"auto".  If `stdout-is-tty` is missing, then checks the standard
-	output of the command itself, and exits with status 0 if color
-	is to be used, or exits with status 1 otherwise.
-	When the color setting for `name` is undefined, the command uses
-	`color.ui` as fallback.
-
---get-color name [default]::
-
-	Find the color configured for `name` (e.g. `color.diff.new`) and
-	output it as the ANSI color escape sequence to the standard
-	output.  The optional `default` parameter is used instead, if
-	there is no color configured for `name`.
-
--e::
---edit::
-	Opens an editor to modify the specified config file; either
-	'--system', '--global', or repository (default).
-
 [[FILES]]
 FILES
 -----
-- 
1.7.2.3