{"thread":{"id":"15959","subject":"[PATCH] config.txt: alphabetize configuration variable groups","startedAt":"2008-10-19T01:42:31Z","lastAt":"2008-10-19T01:42:31Z","messageCount":1,"participants":["Matt McCutchen"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"93406","messageId":"1224380551.19061.22.camel@mattlaptop2.local","threadId":"15959","inReplyTo":null,"subject":"[PATCH] config.txt: alphabetize configuration variable groups","fromName":"Matt McCutchen","fromEmail":"matt@mattmccutchen.net","sentAt":"2008-10-19T01:42:31Z","receivedAt":"2008-10-19T01:42:31Z","isPatch":true,"sender":{"key":"matt@mattmccutchen.net","avatar":"https://avatars.githubusercontent.com/u/8885753?v=4"},"body":"Signed-off-by: Matt McCutchen <matt@mattmccutchen.net>\n---\n Documentation/config.txt |   96 +++++++++++++++++++++++-----------------------\n 1 files changed, 48 insertions(+), 48 deletions(-)\n\ndiff --git a/Documentation/config.txt b/Documentation/config.txt\nindex da18a54..704d1bb 100644\n--- a/Documentation/config.txt\n+++ b/Documentation/config.txt\n@@ -570,9 +570,6 @@ color.status.<slot>::\n \tto red). The values of these variables may be specified as in\n \tcolor.branch.<slot>.\n \n-commit.template::\n-\tSpecify a file to use as the template for new commit messages.\n-\n color.ui::\n \tWhen set to `always`, always use colors in all git commands which\n \tare capable of colored output. When false (or `never`), never. When\n@@ -580,6 +577,9 @@ color.ui::\n \tterminal. When more specific variables of color.* are set, they always\n \ttake precedence over this setting. Defaults to false.\n \n+commit.template::\n+\tSpecify a file to use as the template for new commit messages.\n+\n diff.autorefreshindex::\n \tWhen using 'git-diff' to compare with work tree\n \tfiles, do not consider stat-only change as changed.\n@@ -711,18 +711,6 @@ gc.rerereunresolved::\n \tkept for this many days when 'git-rerere gc' is run.\n \tThe default is 15 days.  See linkgit:git-rerere[1].\n \n-rerere.autoupdate::\n-\tWhen set to true, `git-rerere` updates the index with the\n-\tresulting contents after it cleanly resolves conflicts using\n-\tpreviously recorded resolution.  Defaults to false.\n-\n-rerere.enabled::\n-\tActivate recording of resolved conflicts, so that identical\n-\tconflict hunks can be resolved automatically, should they\n-\tbe encountered again.  linkgit:git-rerere[1] command is by\n-\tdefault enabled if you create `rr-cache` directory under\n-\t`$GIT_DIR`, but can be disabled by setting this option to false.\n-\n gitcvs.enabled::\n \tWhether the CVS server interface is enabled for this repository.\n \tSee linkgit:git-cvsserver[1].\n@@ -890,6 +878,10 @@ i18n.logOutputEncoding::\n \tCharacter encoding the commit messages are converted to when\n \trunning 'git-log' and friends.\n \n+imap::\n+\tThe configuration variables in the 'imap' section are described\n+\tin linkgit:git-imap-send[1].\n+\n instaweb.browser::\n \tSpecify the program that will be used to browse your working\n \trepository in gitweb. See linkgit:git-instaweb[1].\n@@ -925,8 +917,6 @@ man.viewer::\n \tSpecify the programs that may be used to display help in the\n \t'man' format. See linkgit:git-help[1].\n \n-include::merge-config.txt[]\n-\n man.<tool>.cmd::\n \tSpecify the command to invoke the specified man viewer. The\n \tspecified command is evaluated in shell with the man page\n@@ -936,6 +926,8 @@ man.<tool>.path::\n \tOverride the path for the given tool that may be used to\n \tdisplay help in the 'man' format. See linkgit:git-help[1].\n \n+include::merge-config.txt[]\n+\n merge.conflictstyle::\n \tSpecify the style in which conflicted hunks are written out to\n \tworking tree files upon merge.  The default is \"merge\", which\n@@ -1052,6 +1044,28 @@ pull.octopus::\n pull.twohead::\n \tThe default merge strategy to use when pulling a single branch.\n \n+receive.fsckObjects::\n+\tIf it is set to true, git-receive-pack will check all received\n+\tobjects. It will abort in the case of a malformed object or a\n+\tbroken link. The result of an abort are only dangling objects.\n+\tDefaults to false.\n+\n+receive.unpackLimit::\n+\tIf the number of objects received in a push is below this\n+\tlimit then the objects will be unpacked into loose object\n+\tfiles. However if the number of received objects equals or\n+\texceeds this limit then the received pack will be stored as\n+\ta pack, after adding any missing delta bases.  Storing the\n+\tpack from a push can make the push operation complete faster,\n+\tespecially on slow filesystems.  If not set, the value of\n+\t`transfer.unpackLimit` is used instead.\n+\n+receive.denyNonFastForwards::\n+\tIf set to true, git-receive-pack will deny a ref update which is\n+\tnot a fast forward. Use this to prevent such an update via a push,\n+\teven if that push is forced. This configuration variable is\n+\tset when initializing a shared repository.\n+\n remote.<name>.url::\n \tThe URL of a remote repository.  See linkgit:git-fetch[1] or\n \tlinkgit:git-push[1].\n@@ -1101,6 +1115,18 @@ repack.usedeltabaseoffset::\n \t\"false\" and repack. Access from old git versions over the\n \tnative protocol are unaffected by this option.\n \n+rerere.autoupdate::\n+\tWhen set to true, `git-rerere` updates the index with the\n+\tresulting contents after it cleanly resolves conflicts using\n+\tpreviously recorded resolution.  Defaults to false.\n+\n+rerere.enabled::\n+\tActivate recording of resolved conflicts, so that identical\n+\tconflict hunks can be resolved automatically, should they\n+\tbe encountered again.  linkgit:git-rerere[1] command is by\n+\tdefault enabled if you create `rr-cache` directory under\n+\t`$GIT_DIR`, but can be disabled by setting this option to false.\n+\n showbranch.default::\n \tThe default set of branches for linkgit:git-show-branch[1].\n \tSee linkgit:git-show-branch[1].\n@@ -1137,6 +1163,11 @@ tar.umask::\n \tarchiving user's umask will be used instead.  See umask(2) and\n \tlinkgit:git-archive[1].\n \n+transfer.unpackLimit::\n+\tWhen `fetch.unpackLimit` or `receive.unpackLimit` are\n+\tnot set, the value of this variable is used instead.\n+\tThe default value is 100.\n+\n url.<base>.insteadOf::\n \tAny URL that starts with this value will be rewritten to\n \tstart, instead, with <base>. In cases where some site serves a\n@@ -1165,37 +1196,6 @@ user.signingkey::\n \tunchanged to gpg's --local-user parameter, so you may specify a key\n \tusing any method that gpg supports.\n \n-imap::\n-\tThe configuration variables in the 'imap' section are described\n-\tin linkgit:git-imap-send[1].\n-\n-receive.fsckObjects::\n-\tIf it is set to true, git-receive-pack will check all received\n-\tobjects. It will abort in the case of a malformed object or a\n-\tbroken link. The result of an abort are only dangling objects.\n-\tDefaults to false.\n-\n-receive.unpackLimit::\n-\tIf the number of objects received in a push is below this\n-\tlimit then the objects will be unpacked into loose object\n-\tfiles. However if the number of received objects equals or\n-\texceeds this limit then the received pack will be stored as\n-\ta pack, after adding any missing delta bases.  Storing the\n-\tpack from a push can make the push operation complete faster,\n-\tespecially on slow filesystems.  If not set, the value of\n-\t`transfer.unpackLimit` is used instead.\n-\n-receive.denyNonFastForwards::\n-\tIf set to true, git-receive-pack will deny a ref update which is\n-\tnot a fast forward. Use this to prevent such an update via a push,\n-\teven if that push is forced. This configuration variable is\n-\tset when initializing a shared repository.\n-\n-transfer.unpackLimit::\n-\tWhen `fetch.unpackLimit` or `receive.unpackLimit` are\n-\tnot set, the value of this variable is used instead.\n-\tThe default value is 100.\n-\n web.browser::\n \tSpecify a web browser that may be used by some commands.\n \tCurrently only linkgit:git-instaweb[1] and linkgit:git-help[1]\n-- \n1.6.0.2.545.g6cb4a\n"}]}