{"thread":{"id":"25908","subject":"[PATCH] git-config.txt: Order options alphabetically","startedAt":"2010-12-01T20:15:47Z","lastAt":"2010-12-01T20:15:47Z","messageCount":1,"participants":["jari.aalto@cante.net"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"157009","messageId":"1291234547-21201-1-git-send-email-jari.aalto@cante.net","threadId":"25908","inReplyTo":null,"subject":"[PATCH] git-config.txt: Order options alphabetically","fromName":"","fromEmail":"jari.aalto@cante.net","sentAt":"2010-12-01T20:15:47Z","receivedAt":"2010-12-01T20:15:47Z","isPatch":true,"sender":{"key":"jari.aalto@cante.net","avatar":"https://avatars.githubusercontent.com/u/34601?v=4"},"body":"From: Jari Aalto <jari.aalto@cante.net>\n\n\nSigned-off-by: Jari Aalto <jari.aalto@cante.net>\n---\n Documentation/git-config.txt |  121 +++++++++++++++++++++---------------------\n 1 files changed, 60 insertions(+), 61 deletions(-)\n\ndiff --git a/Documentation/git-config.txt b/Documentation/git-config.txt\nindex 543dd64..baeeebc 100644\n--- a/Documentation/git-config.txt\n+++ b/Documentation/git-config.txt\n@@ -64,15 +64,27 @@ This command will fail if:\n OPTIONS\n -------\n \n---replace-all::\n-\tDefault behavior is to replace at most one line. This replaces\n-\tall lines matching the key (and optionally the value_regex).\n-\n --add::\n \tAdds a new line to the option without altering any existing\n \tvalues.  This is the same as providing '^$' as the value_regex\n \tin `--replace-all`.\n \n+-e::\n+--edit::\n+\tOpens an editor to modify the specified config file; either\n+\t'--system', '--global', or repository (default).\n+\n+--bool::\n+\t'git config' will ensure that the output is \"true\" or \"false\"\n+\n+--bool-or-int::\n+\t'git config' will ensure that the output matches the format of\n+\teither --bool or --int, as described above.\n+\n+-f config-file::\n+--file config-file::\n+\tUse the given config file instead of the one specified by GIT_CONFIG.\n+\n --get::\n \tGet the value for a given key (optionally filtered by a regex\n \tmatching the value). Returns error code 1 if the key was not\n@@ -82,6 +94,23 @@ OPTIONS\n \tLike get, but does not fail if the number of values for the key\n \tis not exactly one.\n \n+--get-color name [default]::\n+\n+\tFind the color configured for `name` (e.g. `color.diff.new`) and\n+\toutput it as the ANSI color escape sequence to the standard\n+\toutput.  The optional `default` parameter is used instead, if\n+\tthere is no color configured for `name`.\n+\n+--get-colorbool name [stdout-is-tty]::\n+\tFind the color setting for `name` (e.g. `color.diff`) and output\n+\t\"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or\n+\t\"false\", and is taken into account when configuration says\n+\t\"auto\".  If `stdout-is-tty` is missing, then checks the standard\n+\toutput of the command itself, and exits with status 0 if color\n+\tis to be used, or exits with status 1 otherwise.\n+\tWhen the color setting for `name` is undefined, the command uses\n+\t`color.ui` as fallback.\n+\n --get-regexp::\n \tLike --get-all, but interprets the name as a regular expression.\n \tAlso outputs the key names.\n@@ -95,6 +124,33 @@ from all available files.\n +\n See also <<FILES>>.\n \n+--int::\n+\t'git config' will ensure that the output is a simple\n+\tdecimal number.  An optional value suffix of 'k', 'm', or 'g'\n+\tin the config file will cause the value to be multiplied\n+\tby 1024, 1048576, or 1073741824 prior to output.\n+\n+-l::\n+--list::\n+\tList all variables set in config file.\n+\n+--path::\n+\t'git-config' will expand leading '{tilde}' to the value of\n+\t'$HOME', and '{tilde}user' to the home directory for the\n+\tspecified user.  This option has no effect when setting the\n+\tvalue (but you can use 'git config bla {tilde}/' from the\n+\tcommand line to let your shell do the expansion).\n+\n+--remove-section::\n+\tRemove the given section from the configuration file.\n+\n+--rename-section::\n+\tRename the given section to a new name.\n+\n+--replace-all::\n+\tDefault behavior is to replace at most one line. This replaces\n+\tall lines matching the key (and optionally the value_regex).\n+\n --system::\n \tFor writing options: write to system-wide $(prefix)/etc/gitconfig\n \trather than the repository .git/config.\n@@ -104,46 +160,12 @@ rather than from all available files.\n +\n See also <<FILES>>.\n \n--f config-file::\n---file config-file::\n-\tUse the given config file instead of the one specified by GIT_CONFIG.\n-\n---remove-section::\n-\tRemove the given section from the configuration file.\n-\n---rename-section::\n-\tRename the given section to a new name.\n-\n --unset::\n \tRemove the line matching the key from config file.\n \n --unset-all::\n \tRemove all lines matching the key from config file.\n \n--l::\n---list::\n-\tList all variables set in config file.\n-\n---bool::\n-\t'git config' will ensure that the output is \"true\" or \"false\"\n-\n---int::\n-\t'git config' will ensure that the output is a simple\n-\tdecimal number.  An optional value suffix of 'k', 'm', or 'g'\n-\tin the config file will cause the value to be multiplied\n-\tby 1024, 1048576, or 1073741824 prior to output.\n-\n---bool-or-int::\n-\t'git config' will ensure that the output matches the format of\n-\teither --bool or --int, as described above.\n-\n---path::\n-\t'git-config' will expand leading '{tilde}' to the value of\n-\t'$HOME', and '{tilde}user' to the home directory for the\n-\tspecified user.  This option has no effect when setting the\n-\tvalue (but you can use 'git config bla {tilde}/' from the\n-\tcommand line to let your shell do the expansion).\n-\n -z::\n --null::\n \tFor all options that output values and/or keys, always\n@@ -153,29 +175,6 @@ See also <<FILES>>.\n \toutput without getting confused e.g. by values that\n \tcontain line breaks.\n \n---get-colorbool name [stdout-is-tty]::\n-\n-\tFind the color setting for `name` (e.g. `color.diff`) and output\n-\t\"true\" or \"false\".  `stdout-is-tty` should be either \"true\" or\n-\t\"false\", and is taken into account when configuration says\n-\t\"auto\".  If `stdout-is-tty` is missing, then checks the standard\n-\toutput of the command itself, and exits with status 0 if color\n-\tis to be used, or exits with status 1 otherwise.\n-\tWhen the color setting for `name` is undefined, the command uses\n-\t`color.ui` as fallback.\n-\n---get-color name [default]::\n-\n-\tFind the color configured for `name` (e.g. `color.diff.new`) and\n-\toutput it as the ANSI color escape sequence to the standard\n-\toutput.  The optional `default` parameter is used instead, if\n-\tthere is no color configured for `name`.\n-\n--e::\n---edit::\n-\tOpens an editor to modify the specified config file; either\n-\t'--system', '--global', or repository (default).\n-\n [[FILES]]\n FILES\n -----\n-- \n1.7.2.3\n"}]}