config.txt: alphabetize configuration sections
I figured the sections might as well be in some order, so I chose alphabetical but with "core" at the beginning. This should help people add new variables in the right places. Signed-off-by: Matt McCutchen <matt@mattmccutchen.net> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Matt McCutchen committed
Nov 26, 2008 at 03:26 UTC
b0f34c3d6719903e280545e73ae89f6c2ebe533f
1 file changed
+48
-48
Documentation/config.txt
+48
-48
@@ -561,9 +561,6 @@ color.status.<slot>::
561
to red). The values of these variables may be specified as in
562
color.branch.<slot>.
563
564
-commit.template::
565
- Specify a file to use as the template for new commit messages.
566
-
564
color.ui::
565
When set to `always`, always use colors in all git commands which
566
are capable of colored output. When false (or `never`), never. When
@@ -571,6 +568,9 @@ color.ui::
568
terminal. When more specific variables of color.* are set, they always
569
take precedence over this setting. Defaults to false.
570
571
+commit.template::
572
+ Specify a file to use as the template for new commit messages.
573
+
574
diff.autorefreshindex::
575
When using 'git-diff' to compare with work tree
576
files, do not consider stat-only change as changed.
@@ -682,18 +682,6 @@ gc.rerereunresolved::
682
kept for this many days when 'git-rerere gc' is run.
683
The default is 15 days. See linkgit:git-rerere[1].
684
685
-rerere.autoupdate::
686
- When set to true, `git-rerere` updates the index with the
687
- resulting contents after it cleanly resolves conflicts using
688
- previously recorded resolution. Defaults to false.
689
-
690
-rerere.enabled::
691
- Activate recording of resolved conflicts, so that identical
692
- conflict hunks can be resolved automatically, should they
693
- be encountered again. linkgit:git-rerere[1] command is by
694
- default enabled if you create `rr-cache` directory under
695
- `$GIT_DIR`, but can be disabled by setting this option to false.
696
-
685
gitcvs.enabled::
686
Whether the CVS server interface is enabled for this repository.
687
See linkgit:git-cvsserver[1].
@@ -852,6 +840,10 @@ i18n.logOutputEncoding::
840
Character encoding the commit messages are converted to when
841
running 'git-log' and friends.
842
843
+imap::
844
+ The configuration variables in the 'imap' section are described
845
+ in linkgit:git-imap-send[1].
846
+
847
instaweb.browser::
848
Specify the program that will be used to browse your working
849
repository in gitweb. See linkgit:git-instaweb[1].
@@ -887,8 +879,6 @@ man.viewer::
879
Specify the programs that may be used to display help in the
880
'man' format. See linkgit:git-help[1].
881
890
-include::merge-config.txt[]
891
-
882
man.<tool>.cmd::
883
Specify the command to invoke the specified man viewer. The
884
specified command is evaluated in shell with the man page
@@ -898,6 +888,8 @@ man.<tool>.path::
888
Override the path for the given tool that may be used to
889
display help in the 'man' format. See linkgit:git-help[1].
890
891
+include::merge-config.txt[]
892
+
893
mergetool.<tool>.path::
894
Override the path for the given tool. This is useful in case
895
your tool is not in the PATH.
@@ -1006,6 +998,28 @@ pull.octopus::
998
pull.twohead::
999
The default merge strategy to use when pulling a single branch.
1000
1001
+receive.fsckObjects::
1002
+ If it is set to true, git-receive-pack will check all received
1003
+ objects. It will abort in the case of a malformed object or a
1004
+ broken link. The result of an abort are only dangling objects.
1005
+ Defaults to false.
1006
+
1007
+receive.unpackLimit::
1008
+ If the number of objects received in a push is below this
1009
+ limit then the objects will be unpacked into loose object
1010
+ files. However if the number of received objects equals or
1011
+ exceeds this limit then the received pack will be stored as
1012
+ a pack, after adding any missing delta bases. Storing the
1013
+ pack from a push can make the push operation complete faster,
1014
+ especially on slow filesystems. If not set, the value of
1015
+ `transfer.unpackLimit` is used instead.
1016
+
1017
+receive.denyNonFastForwards::
1018
+ If set to true, git-receive-pack will deny a ref update which is
1019
+ not a fast forward. Use this to prevent such an update via a push,
1020
+ even if that push is forced. This configuration variable is
1021
+ set when initializing a shared repository.
1022
+
1023
remote.<name>.url::
1024
The URL of a remote repository. See linkgit:git-fetch[1] or
1025
linkgit:git-push[1].
@@ -1055,6 +1069,18 @@ repack.usedeltabaseoffset::
1069
"false" and repack. Access from old git versions over the
1070
native protocol are unaffected by this option.
1071
1072
+rerere.autoupdate::
1073
+ When set to true, `git-rerere` updates the index with the
1074
+ resulting contents after it cleanly resolves conflicts using
1075
+ previously recorded resolution. Defaults to false.
1076
+
1077
+rerere.enabled::
1078
+ Activate recording of resolved conflicts, so that identical
1079
+ conflict hunks can be resolved automatically, should they
1080
+ be encountered again. linkgit:git-rerere[1] command is by
1081
+ default enabled if you create `rr-cache` directory under
1082
+ `$GIT_DIR`, but can be disabled by setting this option to false.
1083
+
1084
showbranch.default::
1085
The default set of branches for linkgit:git-show-branch[1].
1086
See linkgit:git-show-branch[1].
@@ -1091,6 +1117,11 @@ tar.umask::
1117
archiving user's umask will be used instead. See umask(2) and
1118
linkgit:git-archive[1].
1119
1120
+transfer.unpackLimit::
1121
+ When `fetch.unpackLimit` or `receive.unpackLimit` are
1122
+ not set, the value of this variable is used instead.
1123
+ The default value is 100.
1124
+
1125
url.<base>.insteadOf::
1126
Any URL that starts with this value will be rewritten to
1127
start, instead, with <base>. In cases where some site serves a
@@ -1119,37 +1150,6 @@ user.signingkey::
1150
unchanged to gpg's --local-user parameter, so you may specify a key
1151
using any method that gpg supports.
1152
1122
-imap::
1123
- The configuration variables in the 'imap' section are described
1124
- in linkgit:git-imap-send[1].
1125
-
1126
-receive.fsckObjects::
1127
- If it is set to true, git-receive-pack will check all received
1128
- objects. It will abort in the case of a malformed object or a
1129
- broken link. The result of an abort are only dangling objects.
1130
- Defaults to false.
1131
-
1132
-receive.unpackLimit::
1133
- If the number of objects received in a push is below this
1134
- limit then the objects will be unpacked into loose object
1135
- files. However if the number of received objects equals or
1136
- exceeds this limit then the received pack will be stored as
1137
- a pack, after adding any missing delta bases. Storing the
1138
- pack from a push can make the push operation complete faster,
1139
- especially on slow filesystems. If not set, the value of
1140
- `transfer.unpackLimit` is used instead.
1141
-
1142
-receive.denyNonFastForwards::
1143
- If set to true, git-receive-pack will deny a ref update which is
1144
- not a fast forward. Use this to prevent such an update via a push,
1145
- even if that push is forced. This configuration variable is
1146
- set when initializing a shared repository.
1147
-
1148
-transfer.unpackLimit::
1149
- When `fetch.unpackLimit` or `receive.unpackLimit` are
1150
- not set, the value of this variable is used instead.
1151
- The default value is 100.
1152
-
1153
web.browser::
1154
Specify a web browser that may be used by some commands.
1155
Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]