@@ -150,27 +150,34 @@ integer::
150150 1024", "by 1024x1024", etc.
151151
152152color::
153- The value for a variables that takes a color is a list of
154- colors (at most two) and attributes (at most one), separated
155- by spaces. The colors accepted are `normal`, `black`,
156- `red`, `green`, `yellow`, `blue`, `magenta`, `cyan` and
157- `white`; the attributes are `bold`, `dim`, `ul`, `blink` and
158- `reverse`. The first color given is the foreground; the
159- second is the background. The position of the attribute, if
160- any, doesn't matter. Attributes may be turned off specifically
161- by prefixing them with `no` (e.g., `noreverse`, `noul`, etc).
162- +
163- Colors (foreground and background) may also be given as numbers between
164- 0 and 255; these use ANSI 256-color mode (but note that not all
165- terminals may support this). If your terminal supports it, you may also
166- specify 24-bit RGB values as hex, like `#ff0ab3`.
167- +
168- The attributes are meant to be reset at the beginning of each item
169- in the colored output, so setting color.decorate.branch to `black`
170- will paint that branch name in a plain `black`, even if the previous
171- thing on the same output line (e.g. opening parenthesis before the
172- list of branch names in `log --decorate` output) is set to be
173- painted with `bold` or some other attribute.
153+ The value for a variable that takes a color is a list of
154+ colors (at most two, one for foreground and one for background)
155+ and attributes (as many as you want), separated by spaces.
156+ +
157+ The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
158+ `blue`, `magenta`, `cyan` and `white`. The first color given is the
159+ foreground; the second is the background.
160+ +
161+ Colors may also be given as numbers between 0 and 255; these use ANSI
162+ 256-color mode (but note that not all terminals may support this). If
163+ your terminal supports it, you may also specify 24-bit RGB values as
164+ hex, like `#ff0ab3`.
165+ +
166+ The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`,
167+ `italic`, and `strike` (for crossed-out or "strikethrough" letters).
168+ The position of any attributes with respect to the colors
169+ (before, after, or in between), doesn't matter. Specific attributes may
170+ be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
171+ `no-ul`, etc).
172+ +
173+ For git's pre-defined color slots, the attributes are meant to be reset
174+ at the beginning of each item in the colored output. So setting
175+ `color.decorate.branch` to `black` will paint that branch name in a
176+ plain `black`, even if the previous thing on the same output line (e.g.
177+ opening parenthesis before the list of branch names in `log --decorate`
178+ output) is set to be painted with `bold` or some other attribute.
179+ However, custom log formats may do more complicated and layered
180+ coloring, and the negated forms may be useful there.
174181
175182pathname::
176183 A variable that takes a pathname value can be given a
@@ -441,6 +448,13 @@ specify that no proxy be used for a given domain pattern.
441448This is useful for excluding servers inside a firewall from
442449proxy use, while defaulting to a common proxy for external domains.
443450
451+ core.sshCommand::
452+ If this variable is set, `git fetch` and `git push` will
453+ use the specified command instead of `ssh` when they need to
454+ connect to a remote system. The command is in the same form as
455+ the `GIT_SSH_COMMAND` environment variable and is overridden
456+ when the environment variable is set.
457+
444458core.ignoreStat::
445459 If true, Git will avoid using lstat() calls to detect if files have
446460 changed by setting the "assume-unchanged" bit for those tracked files
@@ -1187,6 +1201,15 @@ difftool.<tool>.cmd::
11871201difftool.prompt::
11881202 Prompt before each invocation of the diff tool.
11891203
1204+ fastimport.unpackLimit::
1205+ If the number of objects imported by linkgit:git-fast-import[1]
1206+ is below this limit, then the objects will be unpacked into
1207+ loose object files. However if the number of imported objects
1208+ equals or exceeds this limit then the pack will be stored as a
1209+ pack. Storing the pack from a fast-import can make the import
1210+ operation complete faster, especially on slow filesystems. If
1211+ not set, the value of `transfer.unpackLimit` is used instead.
1212+
11901213fetch.recurseSubmodules::
11911214 This option can be either set to a boolean value or to 'on-demand'.
11921215 Setting it to a boolean changes the behavior of fetch and pull to
@@ -1218,13 +1241,28 @@ fetch.prune::
12181241 If true, fetch will automatically behave as if the `--prune`
12191242 option was given on the command line. See also `remote.<name>.prune`.
12201243
1244+ fetch.output::
1245+ Control how ref update status is printed. Valid values are
1246+ `full` and `compact`. Default value is `full`. See section
1247+ OUTPUT in linkgit:git-fetch[1] for detail.
1248+
12211249format.attach::
12221250 Enable multipart/mixed attachments as the default for
12231251 'format-patch'. The value can also be a double quoted string
12241252 which will enable attachments as the default and set the
12251253 value as the boundary. See the --attach option in
12261254 linkgit:git-format-patch[1].
12271255
1256+ format.from::
1257+ Provides the default value for the `--from` option to format-patch.
1258+ Accepts a boolean value, or a name and email address. If false,
1259+ format-patch defaults to `--no-from`, using commit authors directly in
1260+ the "From:" field of patch mails. If true, format-patch defaults to
1261+ `--from`, using your committer identity in the "From:" field of patch
1262+ mails and including a "From:" field in the body of the patch mail if
1263+ different. If set to a non-boolean value, format-patch uses that
1264+ value instead of your committer identity. Defaults to false.
1265+
12281266format.numbered::
12291267 A boolean which can enable or disable sequence numbers in patch
12301268 subjects. It defaults to "auto" which enables it only if there
@@ -2399,8 +2437,13 @@ rebase.instructionFormat
23992437
24002438receive.advertiseAtomic::
24012439 By default, git-receive-pack will advertise the atomic push
2402- capability to its clients. If you don't want to this capability
2403- to be advertised, set this variable to false.
2440+ capability to its clients. If you don't want to advertise this
2441+ capability, set this variable to false.
2442+
2443+ receive.advertisePushOptions::
2444+ By default, git-receive-pack will advertise the push options
2445+ capability to its clients. If you don't want to advertise this
2446+ capability, set this variable to false.
24042447
24052448receive.autogc::
24062449 By default, git-receive-pack will run "git-gc --auto" after
@@ -2455,6 +2498,15 @@ receive.fsck.skipList::
24552498 can be safely ignored such as invalid committer email addresses.
24562499 Note: corrupt objects cannot be skipped with this setting.
24572500
2501+ receive.keepAlive::
2502+ After receiving the pack from the client, `receive-pack` may
2503+ produce no output (if `--quiet` was specified) while processing
2504+ the pack, causing some networks to drop the TCP connection.
2505+ With this option set, if `receive-pack` does not transmit
2506+ any data in this phase for `receive.keepAlive` seconds, it will
2507+ send a short keepalive packet. The default is 5 seconds; set
2508+ to 0 to disable keepalives entirely.
2509+
24582510receive.unpackLimit::
24592511 If the number of objects received in a push is below this
24602512 limit then the objects will be unpacked into loose object
@@ -2881,6 +2933,21 @@ uploadpack.keepAlive::
28812933 `uploadpack.keepAlive` seconds. Setting this option to 0
28822934 disables keepalive packets entirely. The default is 5 seconds.
28832935
2936+ uploadpack.packObjectsHook::
2937+ If this option is set, when `upload-pack` would run
2938+ `git pack-objects` to create a packfile for a client, it will
2939+ run this shell command instead. The `pack-objects` command and
2940+ arguments it _would_ have run (including the `git pack-objects`
2941+ at the beginning) are appended to the shell command. The stdin
2942+ and stdout of the hook are treated as if `pack-objects` itself
2943+ was run. I.e., `upload-pack` will feed input intended for
2944+ `pack-objects` to the hook, and expects a completed packfile on
2945+ stdout.
2946+ +
2947+ Note that this configuration variable is ignored if it is seen in the
2948+ repository-level config (this is a safety measure against fetching from
2949+ untrusted repositories).
2950+
28842951url.<base>.insteadOf::
28852952 Any URL that starts with this value will be rewritten to
28862953 start, instead, with <base>. In cases where some site serves a
0 commit comments