]> git.ipfire.org Git - thirdparty/git.git/blame - Documentation/config.txt
config.txt: move credential.* to a separate file
[thirdparty/git.git] / Documentation / config.txt
CommitLineData
1ab661dd
PB
1CONFIGURATION FILE
2------------------
3
2de9b711
TA
4The Git configuration file contains a number of variables that affect
5the Git commands' behavior. The `.git/config` file in each repository
66e35fcb
SB
6is used to store the configuration for that repository, and
7`$HOME/.gitconfig` is used to store a per-user configuration as
773002a7 8fallback values for the `.git/config` file. The file `/etc/gitconfig`
66e35fcb 9can be used to store a system-wide default configuration.
5ea5621f 10
2de9b711 11The configuration variables are used by both the Git plumbing
b7ee2266
SB
12and the porcelains. The variables are divided into sections, wherein
13the fully qualified variable name of the variable itself is the last
1ab661dd 14dot-separated segment and the section name is everything before the last
e0a4aae8
LP
15dot. The variable names are case-insensitive, allow only alphanumeric
16characters and `-`, and must start with an alphabetic character. Some
a5285b6c
JH
17variables may appear multiple times; we say then that the variable is
18multivalued.
1ab661dd 19
e136f33b
JN
20Syntax
21~~~~~~
22
1ab661dd 23The syntax is fairly flexible and permissive; whitespaces are mostly
e136f33b
JN
24ignored. The '#' and ';' characters begin comments to the end of line,
25blank lines are ignored.
26
27The file consists of sections and variables. A section begins with
28the name of the section in square brackets and continues until the next
05c3e5c7 29section begins. Section names are case-insensitive. Only alphanumeric
dcb11263 30characters, `-` and `.` are allowed in section names. Each variable
773002a7
SB
31must belong to some section, which means that there must be a section
32header before the first setting of a variable.
e136f33b
JN
33
34Sections can be further divided into subsections. To begin a subsection
35put its name in double quotes, separated by space from the section name,
773002a7 36in the section header, like in the example below:
e136f33b
JN
37
38--------
39 [section "subsection"]
40
41--------
42
b7ee2266 43Subsection names are case sensitive and can contain any characters except
1feb0617
DB
44newline and the null byte. Doublequote `"` and backslash can be included
45by escaping them as `\"` and `\\`, respectively. Backslashes preceding
46other characters are dropped when reading; for example, `\t` is read as
47`t` and `\0` is read as `0` Section headers cannot span multiple lines.
48Variables may belong directly to a section or to a given subsection. You
49can have `[section]` if you have `[section "subsection"]`, but you don't
50need to.
e136f33b 51
f7376329
CMN
52There is also a deprecated `[section.subsection]` syntax. With this
53syntax, the subsection name is converted to lower-case and is also
54compared case sensitively. These subsection names follow the same
55restrictions as section names.
e136f33b 56
2ceb639f
NS
57All the other lines (and the remainder of the line after the section
58header) are recognized as setting variables, in the form
1c448b3b
JH
59'name = value' (or just 'name', which is a short-hand to say that
60the variable is the boolean "true").
e0a4aae8 61The variable names are case-insensitive, allow only alphanumeric characters
a5285b6c 62and `-`, and must start with an alphabetic character.
e136f33b 63
ff5507ed
JH
64A line that defines a value can be continued to the next line by
65ending it with a `\`; the backquote and the end-of-line are
66stripped. Leading whitespaces after 'name =', the remainder of the
67line after the first comment character '#' or ';', and trailing
68whitespaces of the line are discarded unless they are enclosed in
69double quotes. Internal whitespaces within the value are retained
70verbatim.
e136f33b 71
ff5507ed
JH
72Inside double quotes, double quote `"` and backslash `\` characters
73must be escaped: use `\"` for `"` and `\\` for `\`.
e136f33b 74
dcb11263
CJ
75The following escape sequences (beside `\"` and `\\`) are recognized:
76`\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
a58088ab
JL
77and `\b` for backspace (BS). Other char escape sequences (including octal
78escape sequences) are invalid.
e136f33b 79
1ab661dd 80
9b25a0b5
JK
81Includes
82~~~~~~~~
83
9d71d94d
JK
84The `include` and `includeIf` sections allow you to include config
85directives from another source. These sections behave identically to
86each other with the exception that `includeIf` sections may be ignored
87if their condition does not evaluate to true; see "Conditional includes"
88below.
89
df0233be 90You can include a config file from another by setting the special
9d71d94d
JK
91`include.path` (or `includeIf.*.path`) variable to the name of the file
92to be included. The variable takes a pathname as its value, and is
93subject to tilde expansion. These variables can be given multiple times.
dca83abd 94
a076df28
JK
95The contents of the included file are inserted immediately, as if they
96had been found at the location of the include directive. If the value of the
9d71d94d 97variable is a relative path, the path is considered to
1050e987
NTND
98be relative to the configuration file in which the include directive
99was found. See below for examples.
dca83abd 100
3efd0bed
NTND
101Conditional includes
102~~~~~~~~~~~~~~~~~~~~
103
104You can include a config file from another conditionally by setting a
105`includeIf.<condition>.path` variable to the name of the file to be
9d71d94d 106included.
3efd0bed
NTND
107
108The condition starts with a keyword followed by a colon and some data
109whose format and meaning depends on the keyword. Supported keywords
110are:
111
112`gitdir`::
113
114 The data that follows the keyword `gitdir:` is used as a glob
115 pattern. If the location of the .git directory matches the
116 pattern, the include condition is met.
117+
118The .git location may be auto-discovered, or come from `$GIT_DIR`
119environment variable. If the repository is auto discovered via a .git
120file (e.g. from submodules, or a linked worktree), the .git location
121would be the final location where the .git directory is, not where the
122.git file is.
123+
124The pattern can contain standard globbing wildcards and two additional
125ones, `**/` and `/**`, that can match multiple path components. Please
126refer to linkgit:gitignore[5] for details. For convenience:
127
128 * If the pattern starts with `~/`, `~` will be substituted with the
129 content of the environment variable `HOME`.
130
131 * If the pattern starts with `./`, it is replaced with the directory
132 containing the current config file.
133
134 * If the pattern does not start with either `~/`, `./` or `/`, `**/`
135 will be automatically prepended. For example, the pattern `foo/bar`
136 becomes `**/foo/bar` and would match `/any/path/to/foo/bar`.
137
138 * If the pattern ends with `/`, `**` will be automatically added. For
139 example, the pattern `foo/` becomes `foo/**`. In other words, it
140 matches "foo" and everything inside, recursively.
141
142`gitdir/i`::
143 This is the same as `gitdir` except that matching is done
144 case-insensitively (e.g. on case-insensitive file sytems)
145
146A few more notes on matching via `gitdir` and `gitdir/i`:
147
148 * Symlinks in `$GIT_DIR` are not resolved before matching.
149
0624c63c
ÆAB
150 * Both the symlink & realpath versions of paths will be matched
151 outside of `$GIT_DIR`. E.g. if ~/git is a symlink to
152 /mnt/storage/git, both `gitdir:~/git` and `gitdir:/mnt/storage/git`
153 will match.
154+
155This was not the case in the initial release of this feature in
156v2.13.0, which only matched the realpath version. Configuration that
157wants to be compatible with the initial release of this feature needs
158to either specify only the realpath version, or both versions.
159
3efd0bed
NTND
160 * Note that "../" is not special and will match literally, which is
161 unlikely what you want.
9b25a0b5 162
1ab661dd
PB
163Example
164~~~~~~~
165
166 # Core variables
167 [core]
168 ; Don't trust file modes
169 filemode = false
170
171 # Our diff algorithm
172 [diff]
6bb9e51b 173 external = /usr/local/bin/diff-wrapper
1ab661dd
PB
174 renames = true
175
910c00c8
AK
176 [branch "devel"]
177 remote = origin
178 merge = refs/heads/devel
179
e136f33b
JN
180 # Proxy settings
181 [core]
29093c28 182 gitProxy="ssh" for "kernel.org"
e136f33b 183 gitProxy=default-proxy ; for the rest
910c00c8 184
9b25a0b5
JK
185 [include]
186 path = /path/to/foo.inc ; include by absolute path
ce933ebd
JK
187 path = foo.inc ; find "foo.inc" relative to the current file
188 path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory
9b25a0b5 189
3efd0bed
NTND
190 ; include if $GIT_DIR is /path/to/foo/.git
191 [includeIf "gitdir:/path/to/foo/.git"]
192 path = /path/to/foo.inc
193
194 ; include for all repositories inside /path/to/group
195 [includeIf "gitdir:/path/to/group/"]
196 path = /path/to/foo.inc
197
198 ; include for all repositories inside $HOME/to/group
199 [includeIf "gitdir:~/to/group/"]
200 path = /path/to/foo.inc
5f7b91ba 201
994cd6c7
JK
202 ; relative paths are always relative to the including
203 ; file (if the condition is true); their location is not
204 ; affected by the condition
205 [includeIf "gitdir:/path/to/group/"]
206 path = foo.inc
207
5f7b91ba
JH
208Values
209~~~~~~
210
211Values of many variables are treated as a simple string, but there
212are variables that take values of specific types and there are rules
213as to how to spell them.
214
215boolean::
216
217 When a variable is said to take a boolean value, many
218 synonyms are accepted for 'true' and 'false'; these are all
219 case-insensitive.
220
7f0a02be
AH
221 true;; Boolean true literals are `yes`, `on`, `true`,
222 and `1`. Also, a variable defined without `= <value>`
5f7b91ba
JH
223 is taken as true.
224
7f0a02be
AH
225 false;; Boolean false literals are `no`, `off`, `false`,
226 `0` and the empty string.
5f7b91ba 227+
ed3bb3df 228When converting a value to its canonical form using the `--type=bool` type
7f0a02be 229specifier, 'git config' will ensure that the output is "true" or
5f7b91ba
JH
230"false" (spelled in lowercase).
231
232integer::
233 The value for many variables that specify various sizes can
234 be suffixed with `k`, `M`,... to mean "scale the number by
235 1024", "by 1024x1024", etc.
236
b92c1a28 237color::
adb33566
JK
238 The value for a variable that takes a color is a list of
239 colors (at most two, one for foreground and one for background)
240 and attributes (as many as you want), separated by spaces.
5f456b3c 241+
adb33566
JK
242The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`,
243`blue`, `magenta`, `cyan` and `white`. The first color given is the
244foreground; the second is the background.
5ee87585 245+
adb33566
JK
246Colors may also be given as numbers between 0 and 255; these use ANSI
247256-color mode (but note that not all terminals may support this). If
248your terminal supports it, you may also specify 24-bit RGB values as
249hex, like `#ff0ab3`.
250+
9dc3515c
JK
251The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`,
252`italic`, and `strike` (for crossed-out or "strikethrough" letters).
253The position of any attributes with respect to the colors
54590a0e
JK
254(before, after, or in between), doesn't matter. Specific attributes may
255be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`,
256`no-ul`, etc).
adb33566 257+
512aba26
JK
258An empty color string produces no color effect at all. This can be used
259to avoid coloring specific elements without disabling color entirely.
260+
adb33566
JK
261For git's pre-defined color slots, the attributes are meant to be reset
262at the beginning of each item in the colored output. So setting
263`color.decorate.branch` to `black` will paint that branch name in a
264plain `black`, even if the previous thing on the same output line (e.g.
265opening parenthesis before the list of branch names in `log --decorate`
266output) is set to be painted with `bold` or some other attribute.
267However, custom log formats may do more complicated and layered
268coloring, and the negated forms may be useful there.
b92c1a28 269
dca83abd
JH
270pathname::
271 A variable that takes a pathname value can be given a
272 string that begins with "`~/`" or "`~user/`", and the usual
273 tilde expansion happens to such a string: `~/`
274 is expanded to the value of `$HOME`, and `~user/` to the
275 specified user's home directory.
276
5f7b91ba 277
1ab661dd
PB
278Variables
279~~~~~~~~~
280
281Note that this list is non-comprehensive and not necessarily complete.
b8936cf0 282For command-specific variables, you will find a more detailed description
93728b23
CA
283in the appropriate manual page.
284
285Other git-related tools may and do use their own variables. When
286inventing new variables for use in your own tool, make sure their
287names do not conflict with those that are used by Git itself and
288other popular tools, and describe them in your documentation.
289
838ef420 290include::config/advice.txt[]
75194438 291
1a394fa9 292include::config/core.txt[]
dce96489 293
29120d8e 294include::config/add.txt[]
13bd2134 295
f740c8f1 296include::config/alias.txt[]
dfd42a3c 297
d293ffef 298include::config/am.txt[]
e97a5e76 299
696d4796 300include::config/apply.txt[]
1ab661dd 301
d09467b6 302include::config/blame.txt[]
8578037b 303
7273b95d 304include::config/branch.txt[]
a5ba2cbe 305
6b0b9740 306include::config/browser.txt[]
584627b4 307
9140b410 308include::config/checkout.txt[]
fa655d84 309
328e629c 310include::config/clean.txt[]
2122591b 311
0a7839e3 312include::config/color.txt[]
6b2f2d98 313
dbfc949f 314include::config/column.txt[]
d96e3c15 315
5453d236 316include::config/commit.txt[]
aaab8420 317
3a49be6d 318include::config/credential.txt[]
7f4d4746 319
6532f374
NTND
320completion.commands::
321 This is only used by git-completion.bash to add or remove
322 commands from the list of completed commands. Normally only
323 porcelain commands and a few select others are completed. You
324 can add more commands, separated by space, in this
325 variable. Prefixing the command with '-' will remove it from
326 the existing list.
327
19299a84 328include::diff-config.txt[]
afcbc8e7
DA
329
330difftool.<tool>.path::
331 Override the path for the given tool. This is useful in case
332 your tool is not in the PATH.
333
334difftool.<tool>.cmd::
335 Specify the command to invoke the specified diff tool.
336 The specified command is evaluated in shell with the following
337 variables available: 'LOCAL' is set to the name of the temporary
338 file containing the contents of the diff pre-image and 'REMOTE'
339 is set to the name of the temporary file containing the contents
340 of the diff post-image.
341
a904392e
DA
342difftool.prompt::
343 Prompt before each invocation of the diff tool.
344
d9545c7f
EW
345fastimport.unpackLimit::
346 If the number of objects imported by linkgit:git-fast-import[1]
347 is below this limit, then the objects will be unpacked into
348 loose object files. However if the number of imported objects
349 equals or exceeds this limit then the pack will be stored as a
350 pack. Storing the pack from a fast-import can make the import
351 operation complete faster, especially on slow filesystems. If
352 not set, the value of `transfer.unpackLimit` is used instead.
353
ca0e61c0 354include::fetch-config.txt[]
42cc7485 355
e108551a 356include::format-config.txt[]
bb52995f 357
26488f59
RR
358filter.<driver>.clean::
359 The command which is used to convert the content of a worktree
360 file to a blob upon checkin. See linkgit:gitattributes[5] for
361 details.
362
363filter.<driver>.smudge::
364 The command which is used to convert the content of a blob
365 object to a worktree file upon checkout. See
366 linkgit:gitattributes[5] for details.
367
2becf00f 368fsck.<msg-id>::
b2558abd
ÆAB
369 During fsck git may find issues with legacy data which
370 wouldn't be generated by current versions of git, and which
371 wouldn't be sent over the wire if `transfer.fsckObjects` was
372 set. This feature is intended to support working with legacy
373 repositories containing such data.
374+
375Setting `fsck.<msg-id>` will be picked up by linkgit:git-fsck[1], but
1362df0d
ÆAB
376to accept pushes of such data set `receive.fsck.<msg-id>` instead, or
377to clone or fetch it set `fetch.fsck.<msg-id>`.
b2558abd
ÆAB
378+
379The rest of the documentation discusses `fsck.*` for brevity, but the
1362df0d
ÆAB
380same applies for the corresponding `receive.fsck.*` and
381`fetch.<msg-id>.*`. variables.
b2558abd 382+
d786da1c
ÆAB
383Unlike variables like `color.ui` and `core.editor` the
384`receive.fsck.<msg-id>` and `fetch.fsck.<msg-id>` variables will not
385fall back on the `fsck.<msg-id>` configuration if they aren't set. To
386uniformly configure the same fsck settings in different circumstances
387all three of them they must all set to the same values.
388+
b2558abd
ÆAB
389When `fsck.<msg-id>` is set, errors can be switched to warnings and
390vice versa by configuring the `fsck.<msg-id>` setting where the
391`<msg-id>` is the fsck message ID and the value is one of `error`,
392`warn` or `ignore`. For convenience, fsck prefixes the error/warning
393with the message ID, e.g. "missingEmail: invalid author/committer line
394- missing email" means that setting `fsck.missingEmail = ignore` will
395hide that issue.
396+
397In general, it is better to enumerate existing objects with problems
398with `fsck.skipList`, instead of listing the kind of breakages these
399problematic objects share to be ignored, as doing the latter will
400allow new instances of the same breakages go unnoticed.
8a6d0525
ÆAB
401+
402Setting an unknown `fsck.<msg-id>` value will cause fsck to die, but
403doing the same for `receive.fsck.<msg-id>` and `fetch.fsck.<msg-id>`
404will only cause git to warn.
2becf00f 405
1335f732 406fsck.skipList::
12b1c50a 407 The path to a list of object names (i.e. one unabbreviated SHA-1 per
1335f732 408 line) that are known to be broken in a non-fatal way and should
371a6550
ÆAB
409 be ignored. On versions of Git 2.20 and later comments ('#'), empty
410 lines, and any leading and trailing whitespace is ignored. Everything
411 but a SHA-1 per line will error out on older versions.
f706c42b
ÆAB
412+
413This feature is useful when an established project should be accepted
414despite early commits containing errors that can be safely ignored
415such as invalid committer email addresses. Note: corrupt objects
416cannot be skipped with this setting.
b2558abd 417+
1362df0d
ÆAB
418Like `fsck.<msg-id>` this variable has corresponding
419`receive.fsck.skipList` and `fetch.fsck.skipList` variants.
d786da1c
ÆAB
420+
421Unlike variables like `color.ui` and `core.editor` the
422`receive.fsck.skipList` and `fetch.fsck.skipList` variables will not
423fall back on the `fsck.skipList` configuration if they aren't set. To
424uniformly configure the same fsck settings in different circumstances
425all three of them they must all set to the same values.
58dc440b
ÆAB
426+
427Older versions of Git (before 2.20) documented that the object names
428list should be sorted. This was never a requirement, the object names
3b41fb0c
RS
429could appear in any order, but when reading the list we tracked whether
430the list was sorted for the purposes of an internal binary search
431implementation, which could save itself some work with an already sorted
432list. Unless you had a humongous list there was no reason to go out of
433your way to pre-sort the list. After Git version 2.20 a hash implementation
434is used instead, so there's now no reason to pre-sort the list.
1335f732 435
125f8146
NTND
436gc.aggressiveDepth::
437 The depth parameter used in the delta compression
438 algorithm used by 'git gc --aggressive'. This defaults
07e7dbf0 439 to 50.
125f8146 440
0d7566a5
TT
441gc.aggressiveWindow::
442 The window size parameter used in the delta compression
0b444cdb 443 algorithm used by 'git gc --aggressive'. This defaults
f78683f3 444 to 250.
0d7566a5 445
e9831e83
JH
446gc.auto::
447 When there are approximately more than this many loose
448 objects in the repository, `git gc --auto` will pack them.
449 Some Porcelain commands use this command to perform a
80cd9cf9
MB
450 light-weight garbage collection from time to time. The
451 default value is 6700. Setting this to 0 disables it.
e9831e83 452
da0005b8 453gc.autoPackLimit::
17815501
JH
454 When there are more than this many packs that are not
455 marked with `*.keep` file in the repository, `git gc
80cd9cf9 456 --auto` consolidates them into one larger pack. The
97063974 457 default value is 50. Setting this to 0 disables it.
17815501 458
da0005b8 459gc.autoDetach::
f745acb0 460 Make `git gc --auto` return immediately and run in background
9f673f94
NTND
461 if the system supports it. Default is true.
462
55dfe13d
NTND
463gc.bigPackThreshold::
464 If non-zero, all packs larger than this limit are kept when
465 `git gc` is run. This is very similar to `--keep-base-pack`
466 except that all packs that meet the threshold are kept, not
467 just the base pack. Defaults to zero. Common unit suffixes of
468 'k', 'm', or 'g' are supported.
8fc67762
NTND
469+
470Note that if the number of kept packs is more than gc.autoPackLimit,
471this configuration variable is ignored, all packs except the base pack
472will be repacked. After this the number of packs should go below
473gc.autoPackLimit and gc.bigPackThreshold should be respected again.
55dfe13d 474
d915114a
DS
475gc.writeCommitGraph::
476 If true, then gc will rewrite the commit-graph file when
477 linkgit:git-gc[1] is run. When using linkgit:git-gc[1]
478 '--auto' the commit-graph will be updated if housekeeping is
479 required. Default is false. See linkgit:git-commit-graph[1]
480 for details.
481
a831c06a 482gc.logExpiry::
30299702
JN
483 If the file gc.log exists, then `git gc --auto` will print
484 its content and exit with status zero instead of running
a831c06a
DT
485 unless that file is more than 'gc.logExpiry' old. Default is
486 "1.day". See `gc.pruneExpire` for more ways to specify its
487 value.
488
da0005b8 489gc.packRefs::
efc266e8
JN
490 Running `git pack-refs` in a repository renders it
491 unclonable by Git versions prior to 1.5.1.2 over dumb
492 transports such as HTTP. This variable determines whether
4be0c352 493 'git gc' runs `git pack-refs`. This can be set to `notbare`
efc266e8
JN
494 to enable it within all non-bare repos or it can be set to a
495 boolean value. The default is `true`.
c2120e5e 496
da0005b8 497gc.pruneExpire::
0b444cdb 498 When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
8e8daf33 499 Override the grace period with this config variable. The value
8cc88166
ES
500 "now" may be used to disable this grace period and always prune
501 unreachable objects immediately, or "never" may be used to
f1350d0c
MM
502 suppress pruning. This feature helps prevent corruption when
503 'git gc' runs concurrently with another process writing to the
504 repository; see the "NOTES" section of linkgit:git-gc[1].
25ee9731 505
114ff888 506gc.worktreePruneExpire::
b07244f4 507 When 'git gc' is run, it calls
fe819b4b 508 'git worktree prune --expire 3.months.ago'.
b07244f4
MH
509 This config variable can be used to set a different grace
510 period. The value "now" may be used to disable the grace
f212dcc7 511 period and prune `$GIT_DIR/worktrees` immediately, or "never"
8cc88166 512 may be used to suppress pruning.
e3df33bb 513
da0005b8
NTND
514gc.reflogExpire::
515gc.<pattern>.reflogExpire::
0b444cdb 516 'git reflog expire' removes reflog entries older than
8cc88166
ES
517 this time; defaults to 90 days. The value "now" expires all
518 entries immediately, and "never" suppresses expiration
519 altogether. With "<pattern>" (e.g.
eb523a8d
JH
520 "refs/stash") in the middle the setting applies only to
521 the refs that match the <pattern>.
4aec56d1 522
da0005b8 523gc.reflogExpireUnreachable::
f04c6904 524gc.<pattern>.reflogExpireUnreachable::
0b444cdb 525 'git reflog expire' removes reflog entries older than
4aec56d1 526 this time and are not reachable from the current tip;
8cc88166
ES
527 defaults to 30 days. The value "now" expires all entries
528 immediately, and "never" suppresses expiration altogether.
529 With "<pattern>" (e.g. "refs/stash")
eb523a8d
JH
530 in the middle, the setting applies only to the refs that
531 match the <pattern>.
4aec56d1 532
da0005b8 533gc.rerereResolved::
48c32424 534 Records of conflicted merge you resolved earlier are
0b444cdb 535 kept for this many days when 'git rerere gc' is run.
6e96cb52 536 You can also use more human-readable "1.month.ago", etc.
5162e697 537 The default is 60 days. See linkgit:git-rerere[1].
48c32424 538
da0005b8 539gc.rerereUnresolved::
48c32424 540 Records of conflicted merge you have not resolved are
0b444cdb 541 kept for this many days when 'git rerere gc' is run.
6e96cb52 542 You can also use more human-readable "1.month.ago", etc.
5162e697 543 The default is 15 days. See linkgit:git-rerere[1].
48c32424 544
3d28c3d8 545include::gitcvs-config.txt[]
04752868 546
cd82323f
JN
547gitweb.category::
548gitweb.description::
549gitweb.owner::
550gitweb.url::
551 See linkgit:gitweb[1] for description.
552
553gitweb.avatar::
554gitweb.blame::
555gitweb.grep::
556gitweb.highlight::
557gitweb.patches::
558gitweb.pickaxe::
559gitweb.remote_heads::
da0005b8 560gitweb.showSizes::
cd82323f
JN
561gitweb.snapshot::
562 See linkgit:gitweb.conf[5] for description.
563
b22520a3 564grep.lineNumber::
23f8239b 565 If set to true, enable `-n` option by default.
b22520a3 566
6653fec3
TB
567grep.column::
568 If set to true, enable the `--column` option by default.
569
84befcd0
S
570grep.patternType::
571 Set the default matching behavior. Using a value of 'basic', 'extended',
bcf9626a
MM
572 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`,
573 `--fixed-strings`, or `--perl-regexp` option accordingly, while the
84befcd0
S
574 value 'default' will return to the default matching behavior.
575
b22520a3 576grep.extendedRegexp::
bcf9626a 577 If set to true, enable `--extended-regexp` option by default. This
ae9f6311 578 option is ignored when the `grep.patternType` option is set to a value
84befcd0 579 other than 'default'.
b22520a3 580
89f09dd3
VL
581grep.threads::
582 Number of grep worker threads to use.
583 See `grep.threads` in linkgit:git-grep[1] for more information.
584
ecd9ba61
TG
585grep.fallbackToNoIndex::
586 If set to true, fall back to git grep --no-index if git grep
587 is executed outside of a git repository. Defaults to false.
588
0c5e70f0 589gpg.program::
f212dcc7 590 Use this custom program instead of "`gpg`" found on `$PATH` when
0c5e70f0 591 making or verifying a PGP signature. The program must support the
06ab60c0 592 same command-line interface as GPG, namely, to verify a detached
f212dcc7 593 signature, "`gpg --verify $file - <$signature`" is run, and the
0c5e70f0 594 program is expected to signal a good signature by exiting with
f745acb0 595 code 0, and to generate an ASCII-armored detached signature, the
f212dcc7 596 standard input of "`gpg -bsau $key`" is fed with the contents to be
0c5e70f0
JH
597 signed, and the program is expected to send the result to its
598 standard output.
599
57a8dd75
HS
600gpg.format::
601 Specifies which key format to use when signing with `--gpg-sign`.
1e7adb97 602 Default is "openpgp" and another possible value is "x509".
57a8dd75 603
b02f51b1
HS
604gpg.<format>.program::
605 Use this to customize the program used for the signing format you
606 chose. (see `gpg.program` and `gpg.format`) `gpg.program` can still
1e7adb97
HS
607 be used as a legacy synonym for `gpg.openpgp.program`. The default
608 value for `gpg.x509.program` is "gpgsm".
b02f51b1 609
fb981ced 610include::gui-config.txt[]
a2df1fb2 611
390c3480
AG
612guitool.<name>.cmd::
613 Specifies the shell command line to execute when the corresponding item
614 of the linkgit:git-gui[1] `Tools` menu is invoked. This option is
615 mandatory for every tool. The command is executed from the root of
616 the working directory, and in the environment it receives the name of
eee7f4a2 617 the tool as `GIT_GUITOOL`, the name of the currently selected file as
390c3480
AG
618 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if
619 the head is detached, 'CUR_BRANCH' is empty).
620
da0005b8 621guitool.<name>.needsFile::
390c3480
AG
622 Run the tool only if a diff is selected in the GUI. It guarantees
623 that 'FILENAME' is not empty.
624
da0005b8 625guitool.<name>.noConsole::
390c3480
AG
626 Run the command silently, without creating a window to display its
627 output.
628
da0005b8 629guitool.<name>.noRescan::
390c3480
AG
630 Don't rescan the working directory for changes after the tool
631 finishes execution.
632
633guitool.<name>.confirm::
634 Show a confirmation dialog before actually running the tool.
635
da0005b8 636guitool.<name>.argPrompt::
390c3480 637 Request a string argument from the user, and pass it to the tool
47d81b5c 638 through the `ARGS` environment variable. Since requesting an
390c3480
AG
639 argument implies confirmation, the 'confirm' option has no effect
640 if this is enabled. If the option is set to 'true', 'yes', or '1',
641 the dialog uses a built-in generic prompt; otherwise the exact
642 value of the variable is used.
643
da0005b8 644guitool.<name>.revPrompt::
390c3480 645 Request a single valid revision from the user, and set the
47d81b5c 646 `REVISION` environment variable. In other aspects this option
da0005b8 647 is similar to 'argPrompt', and can be used together with it.
390c3480 648
da0005b8
NTND
649guitool.<name>.revUnmerged::
650 Show only unmerged branches in the 'revPrompt' subdialog.
390c3480
AG
651 This is useful for tools similar to merge or rebase, but not
652 for things like checkout or reset.
653
654guitool.<name>.title::
655 Specifies the title to use for the prompt dialog. The default
656 is the tool name.
657
658guitool.<name>.prompt::
659 Specifies the general prompt string to display at the top of
da0005b8 660 the dialog, before subsections for 'argPrompt' and 'revPrompt'.
390c3480
AG
661 The default value includes the actual command.
662
983a9eeb
CC
663help.browser::
664 Specify the browser that will be used to display help in the
665 'web' format. See linkgit:git-help[1].
666
667help.format::
668 Override the default help format used by linkgit:git-help[1].
669 Values 'man', 'info', 'web' and 'html' are supported. 'man' is
670 the default. 'web' and 'html' are the same.
671
da0005b8 672help.autoCorrect::
f0e90716
AR
673 Automatically correct and execute mistyped commands after
674 waiting for the given number of deciseconds (0.1 sec). If more
675 than one command can be deduced from the entered text, nothing
676 will be executed. If the value of this option is negative,
677 the corrected command will be executed immediately. If the
678 value is 0 - the command will be just shown but not executed.
679 This is the default.
680
da0005b8 681help.htmlPath::
b1f809d0
SS
682 Specify the path where the HTML documentation resides. File system paths
683 and URLs are supported. HTML pages will be prefixed with this path when
684 help is displayed in the 'web' format. This defaults to the documentation
685 path of your Git installation.
686
9c5665aa 687http.proxy::
b2c8c6d9 688 Override the HTTP proxy, normally configured using the 'http_proxy',
372370f1
KF
689 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In
690 addition to the syntax understood by curl, it is possible to specify a
691 proxy string with a user name but no password, in which case git will
692 attempt to acquire one in the same way it does for other credentials. See
693 linkgit:gitcredentials[7] for more information. The syntax thus is
694 '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden
695 on a per-remote basis; see remote.<name>.proxy
9c5665aa 696
ef976395
KF
697http.proxyAuthMethod::
698 Set the method with which to authenticate against the HTTP proxy. This
699 only takes effect if the configured proxy string contains a user name part
700 (i.e. is of the form 'user@host' or 'user@host:port'). This can be
701 overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`.
eee7f4a2 702 Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment
ef976395
KF
703 variable. Possible values are:
704+
705--
706* `anyauth` - Automatically pick a suitable authentication method. It is
707 assumed that the proxy answers an unauthenticated request with a 407
708 status code and one or more Proxy-authenticate headers with supported
709 authentication methods. This is the default.
710* `basic` - HTTP Basic authentication
711* `digest` - HTTP Digest authentication; this prevents the password from being
712 transmitted to the proxy in clear text
713* `negotiate` - GSS-Negotiate authentication (compare the --negotiate option
714 of `curl(1)`)
715* `ntlm` - NTLM authentication (compare the --ntlm option of `curl(1)`)
716--
9c5665aa 717
121061f6 718http.emptyAuth::
719 Attempt authentication without seeking a username or password. This
720 can be used to attempt GSS-Negotiate authentication without specifying
721 a username in the URL, as libcurl normally requires a username for
722 authentication.
723
26a7b234
PS
724http.delegation::
725 Control GSSAPI credential delegation. The delegation is disabled
726 by default in libcurl since version 7.21.7. Set parameter to tell
727 the server what it is allowed to delegate when it comes to user
728 credentials. Used with GSS/kerberos. Possible values are:
729+
730--
731* `none` - Don't allow any delegation.
732* `policy` - Delegates if and only if the OK-AS-DELEGATE flag is set in the
733 Kerberos service ticket, which is a matter of realm policy.
734* `always` - Unconditionally allow the server to delegate.
735--
736
737
8cb01e2f
JS
738http.extraHeader::
739 Pass an additional HTTP header when communicating with a server. If
740 more than one such entry exists, all of them are added as extra
741 headers. To allow overriding the settings inherited from the system
742 config, an empty value will reset the extra headers to the empty list.
743
da0005b8 744http.cookieFile::
e5a39ad8
BN
745 The pathname of a file containing previously stored cookie lines,
746 which should be used
2de9b711 747 in the Git http session, if they match the server. The file format
bcfb95dd 748 of the file to read cookies from should be plain HTTP headers or
1cca17df 749 the Netscape/Mozilla cookie file format (see `curl(1)`).
06ea368b 750 NOTE that the file specified with http.cookieFile is used only as
912b2acf
DB
751 input unless http.saveCookies is set.
752
da0005b8 753http.saveCookies::
912b2acf 754 If set, store cookies received during requests to the file specified by
da0005b8 755 http.cookieFile. Has no effect if http.cookieFile is unset.
bcfb95dd 756
01861cb7
EP
757http.sslVersion::
758 The SSL version to use when negotiating an SSL connection, if you
759 want to force the default. The available and default version
760 depend on whether libcurl was built against NSS or OpenSSL and the
761 particular configuration of the crypto library in use. Internally
762 this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl
763 documentation for more details on the format of this option and
764 for the ssl version supported. Actually the possible values of
765 this option are:
766
767 - sslv2
768 - sslv3
769 - tlsv1
770 - tlsv1.0
771 - tlsv1.1
772 - tlsv1.2
d81b651f 773 - tlsv1.3
01861cb7
EP
774
775+
eee7f4a2 776Can be overridden by the `GIT_SSL_VERSION` environment variable.
01861cb7 777To force git to use libcurl's default ssl version and ignore any
eee7f4a2 778explicit http.sslversion option, set `GIT_SSL_VERSION` to the
01861cb7
EP
779empty string.
780
f6f2a9e4
LKS
781http.sslCipherList::
782 A list of SSL ciphers to use when negotiating an SSL connection.
783 The available ciphers depend on whether libcurl was built against
784 NSS or OpenSSL and the particular configuration of the crypto
785 library in use. Internally this sets the 'CURLOPT_SSL_CIPHER_LIST'
786 option; see the libcurl documentation for more details on the format
787 of this list.
788+
eee7f4a2 789Can be overridden by the `GIT_SSL_CIPHER_LIST` environment variable.
f6f2a9e4 790To force git to use libcurl's default cipher list and ignore any
eee7f4a2 791explicit http.sslCipherList option, set `GIT_SSL_CIPHER_LIST` to the
f6f2a9e4
LKS
792empty string.
793
1ab661dd
PB
794http.sslVerify::
795 Whether to verify the SSL certificate when fetching or pushing
dec366c9
SR
796 over HTTPS. Defaults to true. Can be overridden by the
797 `GIT_SSL_NO_VERIFY` environment variable.
1ab661dd
PB
798
799http.sslCert::
800 File containing the SSL certificate when fetching or pushing
eee7f4a2 801 over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment
1ab661dd
PB
802 variable.
803
804http.sslKey::
805 File containing the SSL private key when fetching or pushing
eee7f4a2 806 over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment
1ab661dd
PB
807 variable.
808
754ae192 809http.sslCertPasswordProtected::
2de9b711 810 Enable Git's password prompt for the SSL certificate. Otherwise
754ae192
ML
811 OpenSSL will prompt the user, possibly many times, if the
812 certificate or private key is encrypted. Can be overridden by the
eee7f4a2 813 `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable.
754ae192 814
1ab661dd
PB
815http.sslCAInfo::
816 File containing the certificates to verify the peer with when
abda1ef5 817 fetching or pushing over HTTPS. Can be overridden by the
eee7f4a2 818 `GIT_SSL_CAINFO` environment variable.
1ab661dd
PB
819
820http.sslCAPath::
821 Path containing files with the CA certificates to verify the peer
37425065 822 with when fetching or pushing over HTTPS. Can be overridden
eee7f4a2 823 by the `GIT_SSL_CAPATH` environment variable.
1ab661dd 824
21084e84
JS
825http.sslBackend::
826 Name of the SSL backend to use (e.g. "openssl" or "schannel").
827 This option is ignored if cURL lacks support for choosing the SSL
828 backend at runtime.
829
93aef7c7
BF
830http.schannelCheckRevoke::
831 Used to enforce or disable certificate revocation checks in cURL
832 when http.sslBackend is set to "schannel". Defaults to `true` if
833 unset. Only necessary to disable this if Git consistently errors
834 and the message is about checking the revocation status of a
835 certificate. This option is ignored if cURL lacks support for
836 setting the relevant SSL option at runtime.
837
b67d40ad
JS
838http.schannelUseSSLCAInfo::
839 As of cURL v7.60.0, the Secure Channel backend can use the
840 certificate bundle provided via `http.sslCAInfo`, but that would
841 override the Windows Certificate Store. Since this is not desirable
842 by default, Git will tell cURL not to use that bundle by default
843 when the `schannel` backend was configured via `http.sslBackend`,
844 unless `http.schannelUseSSLCAInfo` overrides this behavior.
845
aeff8a61
CE
846http.pinnedpubkey::
847 Public key of the https service. It may either be the filename of
848 a PEM or DER encoded public key file or a string starting with
849 'sha256//' followed by the base64 encoded sha256 hash of the
850 public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will
851 exit with an error if this option is set but not supported by
852 cURL.
853
4bc444eb
MV
854http.sslTry::
855 Attempt to use AUTH SSL/TLS and encrypted data transfers
856 when connecting via regular FTP protocol. This might be needed
857 if the FTP server requires it for security reasons or you wish
858 to connect securely whenever remote FTP server supports it.
859 Default is false since it might trigger certificate verification
860 errors on misconfigured servers.
861
1ab661dd 862http.maxRequests::
abda1ef5 863 How many HTTP requests to launch in parallel. Can be overridden
eee7f4a2 864 by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5.
1ab661dd 865
ad75ebe5
TRC
866http.minSessions::
867 The number of curl sessions (counted across slots) to be kept across
868 requests. They will not be ended with curl_easy_cleanup() until
869 http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this
870 value will be capped at 1. Defaults to 1.
871
de1a2fdd
SP
872http.postBuffer::
873 Maximum size in bytes of the buffer used by smart HTTP
874 transports when POSTing data to the remote system.
875 For requests larger than this buffer size, HTTP/1.1 and
876 Transfer-Encoding: chunked is used to avoid creating a
877 massive pack file locally. Default is 1 MiB, which is
878 sufficient for most requests.
879
1ab661dd
PB
880http.lowSpeedLimit, http.lowSpeedTime::
881 If the HTTP transfer speed is less than 'http.lowSpeedLimit'
882 for longer than 'http.lowSpeedTime' seconds, the transfer is aborted.
eee7f4a2
TR
883 Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and
884 `GIT_HTTP_LOW_SPEED_TIME` environment variables.
1ab661dd 885
3ea099d4
SK
886http.noEPSV::
887 A boolean which disables using of EPSV ftp command by curl.
befc9c42 888 This can helpful with some "poor" ftp servers which don't
eee7f4a2 889 support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV`
3ea099d4
SK
890 environment variable. Default is false (curl will use EPSV).
891
da0005b8 892http.userAgent::
b1d1058c 893 The HTTP USER_AGENT string presented to an HTTP server. The default
2de9b711 894 value represents the version of the client Git such as git/1.7.1.
b1d1058c
SO
895 This option allows you to override this value to a more common value
896 such as Mozilla/4.0. This may be necessary, for instance, if
897 connecting through a firewall that restricts HTTP connections to a set
898 of common USER_AGENT strings (but not including those like git/1.7.1).
eee7f4a2 899 Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable.
b1d1058c 900
50d34137
JK
901http.followRedirects::
902 Whether git should follow HTTP redirects. If set to `true`, git
903 will transparently follow any redirect issued by a server it
904 encounters. If set to `false`, git will treat all redirects as
905 errors. If set to `initial`, git will follow redirects only for
906 the initial request to a remote, but not for subsequent
907 follow-up HTTP requests. Since git uses the redirected URL as
908 the base for the follow-up requests, this is generally
909 sufficient. The default is `initial`.
910
6a56993b 911http.<url>.*::
f745acb0 912 Any of the http.* options above can be applied selectively to some URLs.
6a56993b
KM
913 For a config key to match a URL, each element of the config key is
914 compared to that of the URL, in the following order:
915+
916--
917. Scheme (e.g., `https` in `https://example.com/`). This field
918 must match exactly between the config key and the URL.
919
920. Host/domain name (e.g., `example.com` in `https://example.com/`).
a272b9e7
PS
921 This field must match between the config key and the URL. It is
922 possible to specify a `*` as part of the host name to match all subdomains
923 at this level. `https://*.example.com/` for example would match
924 `https://foo.example.com/`, but not `https://foo.bar.example.com/`.
6a56993b
KM
925
926. Port number (e.g., `8080` in `http://example.com:8080/`).
927 This field must match exactly between the config key and the URL.
928 Omitted port numbers are automatically converted to the correct
929 default for the scheme before matching.
930
931. Path (e.g., `repo.git` in `https://example.com/repo.git`). The
932 path field of the config key must match the path field of the URL
933 either exactly or as a prefix of slash-delimited path elements. This means
934 a config key with path `foo/` matches URL path `foo/bar`. A prefix can only
935 match on a slash (`/`) boundary. Longer matches take precedence (so a config
936 key with path `foo/bar` is a better match to URL path `foo/bar` than a config
937 key with just path `foo/`).
938
939. User name (e.g., `user` in `https://user@example.com/repo.git`). If
940 the config key has a user name it must match the user name in the
941 URL exactly. If the config key does not have a user name, that
942 config key will match a URL with any user name (including none),
943 but at a lower precedence than a config key with a user name.
944--
945+
946The list above is ordered by decreasing precedence; a URL that matches
947a config key's path is preferred to one that matches its user name. For example,
948if the URL is `https://user@example.com/foo/bar` a config key match of
949`https://example.com/foo` will be preferred over a config key match of
950`https://user@example.com`.
951+
952All URLs are normalized before attempting any matching (the password part,
953if embedded in the URL, is always ignored for matching purposes) so that
f745acb0
TA
954equivalent URLs that are simply spelled differently will match properly.
955Environment variable settings always override any matches. The URLs that are
6a56993b
KM
956matched against are those given directly to Git commands. This means any URLs
957visited as a result of a redirection do not participate in matching.
958
dd33e077 959ssh.variant::
0da0e49b
JN
960 By default, Git determines the command line arguments to use
961 based on the basename of the configured SSH command (configured
962 using the environment variable `GIT_SSH` or `GIT_SSH_COMMAND` or
963 the config setting `core.sshCommand`). If the basename is
964 unrecognized, Git will attempt to detect support of OpenSSH
965 options by first invoking the configured SSH command with the
966 `-G` (print configuration) option and will subsequently use
967 OpenSSH options (if that is successful) or no options besides
968 the host and remote command (if it fails).
969+
970The config variable `ssh.variant` can be set to override this detection.
971Valid values are `ssh` (to use OpenSSH options), `plink`, `putty`,
972`tortoiseplink`, `simple` (no options except the host and remote command).
973The default auto-detection can be explicitly requested using the value
974`auto`. Any other value is treated as `ssh`. This setting can also be
975overridden via the environment variable `GIT_SSH_VARIANT`.
94b8ae5a
BW
976+
977The current command-line parameters used for each variant are as
978follows:
979+
980--
981
982* `ssh` - [-p port] [-4] [-6] [-o option] [username@]host command
983
984* `simple` - [username@]host command
985
986* `plink` or `putty` - [-P port] [-4] [-6] [username@]host command
987
988* `tortoiseplink` - [-P port] [-4] [-6] -batch [username@]host command
989
990--
991+
992Except for the `simple` variant, command-line parameters are likely to
993change as git gains new features.
dd33e077 994
1ab661dd 995i18n.commitEncoding::
2de9b711 996 Character encoding the commit messages are stored in; Git itself
1ab661dd
PB
997 does not care per se, but this information is necessary e.g. when
998 importing commits from emails or in the gitk graphical history
999 browser (and possibly at other places in the future or in other
5162e697 1000 porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
1ab661dd 1001
d2c11a38
JH
1002i18n.logOutputEncoding::
1003 Character encoding the commit messages are converted to when
0b444cdb 1004 running 'git log' and friends.
d2c11a38 1005
b0f34c3d
MM
1006imap::
1007 The configuration variables in the 'imap' section are described
1008 in linkgit:git-imap-send[1].
1009
c780b9cf
BP
1010index.threads::
1011 Specifies the number of threads to spawn when loading the index.
1012 This is meant to reduce index load time on multiprocessor machines.
1013 Specifying 0 or 'true' will cause Git to auto-detect the number of
1014 CPU's and set the number of threads accordingly. Specifying 1 or
1015 'false' will disable multithreading. Defaults to 'true'.
1016
3c09d684
TG
1017index.version::
1018 Specify the version with which new index files should be
1019 initialized. This does not affect existing repositories.
1020
da0005b8 1021init.templateDir::
d8a8488d
SD
1022 Specify the directory from which templates will be copied.
1023 (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
1024
983a9eeb
CC
1025instaweb.browser::
1026 Specify the program that will be used to browse your working
1027 repository in gitweb. See linkgit:git-instaweb[1].
1028
1029instaweb.httpd::
1030 The HTTP daemon command-line to start gitweb on your working
1031 repository. See linkgit:git-instaweb[1].
1032
1033instaweb.local::
1034 If true the web server started by linkgit:git-instaweb[1] will
1035 be bound to the local IP (127.0.0.1).
1036
da0005b8 1037instaweb.modulePath::
6b677a28
VS
1038 The default module path for linkgit:git-instaweb[1] to use
1039 instead of /usr/lib/apache2/modules. Only used if httpd
1040 is Apache.
983a9eeb
CC
1041
1042instaweb.port::
1043 The port number to bind the gitweb httpd to. See
1044 linkgit:git-instaweb[1].
1045
da0005b8 1046interactive.singleKey::
57f6ec02 1047 In interactive commands, allow the user to provide one-letter
ca6ac7f1 1048 input with a single key (i.e., without hitting enter).
6cf378f0 1049 Currently this is used by the `--patch` mode of
e6b57a8a
CI
1050 linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1],
1051 linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this
1052 setting is silently ignored if portable keystroke input
8358f1ac 1053 is not available; requires the Perl module Term::ReadKey.
ca6ac7f1 1054
01143847
JK
1055interactive.diffFilter::
1056 When an interactive command (such as `git add --patch`) shows
1057 a colorized diff, git will pipe the diff through the shell
1058 command defined by this configuration variable. The command may
1059 mark up the diff further for human consumption, provided that it
1060 retains a one-to-one correspondence with the lines in the
1061 original diff. Defaults to disabled (no filtering).
1062
0c47695a
JS
1063log.abbrevCommit::
1064 If true, makes linkgit:git-log[1], linkgit:git-show[1], and
6cf378f0
JK
1065 linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may
1066 override this option with `--no-abbrev-commit`.
0c47695a 1067
dd0ffd5b 1068log.date::
e860795d
JN
1069 Set the default date-time mode for the 'log' command.
1070 Setting a value for log.date is similar to using 'git log''s
78a84416 1071 `--date` option. See linkgit:git-log[1] for details.
dd0ffd5b 1072
eb734454
SD
1073log.decorate::
1074 Print out the ref names of any commits that are shown by the log
1075 command. If 'short' is specified, the ref name prefixes 'refs/heads/',
1076 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
1077 specified, the full ref name (including prefix) will be printed.
462cbb41
RJ
1078 If 'auto' is specified, then if the output is going to a terminal,
1079 the ref names are shown as if 'short' were given, otherwise no ref
ce18123c 1080 names are shown. This is the same as the `--decorate` option
462cbb41 1081 of the `git log`.
eb734454 1082
fd8d07ef
EVW
1083log.follow::
1084 If `true`, `git log` will act as if the `--follow` option was used when
1085 a single <path> is given. This has the same limitations as `--follow`,
1086 i.e. it cannot be used to follow multiple files and does not work well
1087 on non-linear history.
1088
73c727d6
NTND
1089log.graphColors::
1090 A list of colors, separated by commas, that can be used to draw
1091 history lines in `git log --graph`.
1092
da0005b8 1093log.showRoot::
0f03ca94
PB
1094 If true, the initial commit will be shown as a big creation event.
1095 This is equivalent to a diff against an empty tree.
5162e697 1096 Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
0f03ca94
PB
1097 normally hide the root commit will now show it. True by default.
1098
ba4dce78
KM
1099log.showSignature::
1100 If true, makes linkgit:git-log[1], linkgit:git-show[1], and
1101 linkgit:git-whatchanged[1] assume `--show-signature`.
1102
e6bb5f78
AP
1103log.mailmap::
1104 If true, makes linkgit:git-log[1], linkgit:git-show[1], and
1105 linkgit:git-whatchanged[1] assume `--use-mailmap`.
1106
d5c4b185
MM
1107mailinfo.scissors::
1108 If true, makes linkgit:git-mailinfo[1] (and therefore
1109 linkgit:git-am[1]) act by default as if the --scissors option
1110 was provided on the command-line. When active, this features
1111 removes everything from the message body before a scissors
1112 line (i.e. consisting mainly of ">8", "8<" and "-").
1113
d551a488
MSO
1114mailmap.file::
1115 The location of an augmenting mailmap file. The default
1116 mailmap, located in the root of the repository, is loaded
1117 first, then the mailmap file pointed to by this variable.
1118 The location of the mailmap file may be in a repository
1119 subdirectory, or somewhere outside of the repository itself.
1120 See linkgit:git-shortlog[1] and linkgit:git-blame[1].
1121
08610900
JK
1122mailmap.blob::
1123 Like `mailmap.file`, but consider the value as a reference to a
8c473cec
JK
1124 blob in the repository. If both `mailmap.file` and
1125 `mailmap.blob` are given, both are parsed, with entries from
1126 `mailmap.file` taking precedence. In a bare repository, this
1127 defaults to `HEAD:.mailmap`. In a non-bare repository, it
1128 defaults to empty.
08610900 1129
b5578f33 1130man.viewer::
b8322ea8 1131 Specify the programs that may be used to display help in the
b5578f33
CC
1132 'man' format. See linkgit:git-help[1].
1133
0bb64009
CC
1134man.<tool>.cmd::
1135 Specify the command to invoke the specified man viewer. The
1136 specified command is evaluated in shell with the man page
1137 passed as argument. (See linkgit:git-help[1].)
1138
7e8114c0
CC
1139man.<tool>.path::
1140 Override the path for the given tool that may be used to
1141 display help in the 'man' format. See linkgit:git-help[1].
1142
b0f34c3d 1143include::merge-config.txt[]
b5412484 1144
77680caa
JS
1145mergetool.<tool>.path::
1146 Override the path for the given tool. This is useful in case
1147 your tool is not in the PATH.
1148
964473a0
CB
1149mergetool.<tool>.cmd::
1150 Specify the command to invoke the specified merge tool. The
1151 specified command is evaluated in shell with the following
1152 variables available: 'BASE' is the name of a temporary file
1153 containing the common base of the files to be merged, if available;
1154 'LOCAL' is the name of a temporary file containing the contents of
1155 the file on the current branch; 'REMOTE' is the name of a temporary
1156 file containing the contents of the file from the branch being
1157 merged; 'MERGED' contains the name of the file to which the merge
1158 tool should write the results of a successful merge.
1159
1160mergetool.<tool>.trustExitCode::
1161 For a custom merge command, specify whether the exit code of
1162 the merge command can be used to determine whether the merge was
1163 successful. If this is not set to true then the merge target file
1164 timestamp is checked and the merge assumed to have been successful
1165 if the file has been updated, otherwise the user is prompted to
1166 indicate the success of the merge.
1167
b12d0450
DA
1168mergetool.meld.hasOutput::
1169 Older versions of `meld` do not support the `--output` option.
1170 Git will attempt to detect whether `meld` supports `--output`
1171 by inspecting the output of `meld --help`. Configuring
1172 `mergetool.meld.hasOutput` will make Git skip these checks and
1173 use the configured value instead. Setting `mergetool.meld.hasOutput`
1174 to `true` tells Git to unconditionally use the `--output` option,
1175 and `false` avoids using `--output`.
1176
44c36d1c
CB
1177mergetool.keepBackup::
1178 After performing a merge, the original file with conflict markers
1179 can be saved as a file with a `.orig` extension. If this variable
1180 is set to `false` then this file is not preserved. Defaults to
1181 `true` (i.e. keep the backup files).
1182
162eba8b 1183mergetool.keepTemporaries::
2de9b711 1184 When invoking a custom merge tool, Git uses a set of temporary
162eba8b
CB
1185 files to pass to the tool. If the tool returns an error and this
1186 variable is set to `true`, then these temporary files will be
1187 preserved, otherwise they will be removed after the tool has
1188 exited. Defaults to `false`.
1189
8f0cb41d
DA
1190mergetool.writeToTemp::
1191 Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of
1192 conflicting files in the worktree by default. Git will attempt
1193 to use a temporary directory for these files when set `true`.
1194 Defaults to `false`.
1195
682b451f
CB
1196mergetool.prompt::
1197 Prompt before each invocation of the merge resolution program.
1198
d2d68d99
JK
1199notes.mergeStrategy::
1200 Which merge strategy to choose by default when resolving notes
1201 conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or
1202 `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES"
1203 section of linkgit:git-notes[1] for more information on each strategy.
1204
4f655e22
JK
1205notes.<name>.mergeStrategy::
1206 Which merge strategy to choose when doing a notes merge into
1207 refs/notes/<name>. This overrides the more general
1208 "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in
1209 linkgit:git-notes[1] for more information on the available strategies.
1210
894a9d33
TR
1211notes.displayRef::
1212 The (fully qualified) refname from which to show notes when
1213 showing commit messages. The value of this variable can be set
1214 to a glob, in which case notes from all matching refs will be
1215 shown. You may also specify this configuration variable
1216 several times. A warning will be issued for refs that do not
1217 exist, but a glob that does not match any refs is silently
1218 ignored.
1219+
1220This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
1221environment variable, which must be a colon separated list of refs or
1222globs.
1223+
1224The effective value of "core.notesRef" (possibly overridden by
1225GIT_NOTES_REF) is also implicitly added to the list of refs to be
1226displayed.
1227
6956f858
TR
1228notes.rewrite.<command>::
1229 When rewriting commits with <command> (currently `amend` or
2de9b711 1230 `rebase`) and this variable is set to `true`, Git
6956f858
TR
1231 automatically copies your notes from the original to the
1232 rewritten commit. Defaults to `true`, but see
1233 "notes.rewriteRef" below.
6956f858
TR
1234
1235notes.rewriteMode::
1236 When copying notes during a rewrite (see the
1237 "notes.rewrite.<command>" option), determines what to do if
1238 the target commit already has a note. Must be one of
e48ad1b9
JK
1239 `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`.
1240 Defaults to `concatenate`.
6956f858
TR
1241+
1242This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
1243environment variable.
1244
1245notes.rewriteRef::
1246 When copying notes during a rewrite, specifies the (fully
1247 qualified) ref whose notes should be copied. The ref may be a
1248 glob, in which case notes in all matching refs will be copied.
1249 You may also specify this configuration several times.
1250+
1251Does not have a default value; you must configure this variable to
2b4aa89c
TR
1252enable note rewriting. Set it to `refs/notes/commits` to enable
1253rewriting for the default commit notes.
cfb88e9a
LAS
1254+
1255This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
1256environment variable, which must be a colon separated list of refs or
1257globs.
6956f858 1258
4812a93a 1259pack.window::
5162e697 1260 The size of the window used by linkgit:git-pack-objects[1] when no
4812a93a
JK
1261 window size is given on the command line. Defaults to 10.
1262
842aaf93 1263pack.depth::
5162e697 1264 The maximum delta depth used by linkgit:git-pack-objects[1] when no
618e613a 1265 maximum depth is given on the command line. Defaults to 50.
b5c0cbd8 1266 Maximum value is 4095.
842aaf93 1267
e93b15cd 1268pack.windowMemory::
f4694a8c
RB
1269 The maximum size of memory that is consumed by each thread
1270 in linkgit:git-pack-objects[1] for pack window memory when
1271 no limit is given on the command line. The value can be
1272 suffixed with "k", "m", or "g". When left unconfigured (or
1273 set explicitly to 0), there will be no limit.
e93b15cd 1274
960ccca6
DH
1275pack.compression::
1276 An integer -1..9, indicating the compression level for objects
1277 in a pack file. -1 is the zlib default. 0 means no
1278 compression, and 1..9 are various speed/size tradeoffs, 9 being
1279 slowest. If not set, defaults to core.compression. If that is
dec92309
BD
1280 not set, defaults to -1, the zlib default, which is "a default
1281 compromise between speed and compression (currently equivalent
1282 to level 6)."
89d71f75
JK
1283+
1284Note that changing the compression level will not automatically recompress
1285all existing objects. You can force recompression by passing the -F option
1286to linkgit:git-repack[1].
960ccca6 1287
28b8a730
JK
1288pack.island::
1289 An extended regular expression configuring a set of delta
1290 islands. See "DELTA ISLANDS" in linkgit:git-pack-objects[1]
1291 for details.
1292
1293pack.islandCore::
1294 Specify an island name which gets to have its objects be
1295 packed first. This creates a kind of pseudo-pack at the front
1296 of one pack, so that the objects from the specified island are
1297 hopefully faster to copy into any pack that should be served
1298 to a user requesting these objects. In practice this means
1299 that the island specified should likely correspond to what is
1300 the most commonly cloned in the repo. See also "DELTA ISLANDS"
1301 in linkgit:git-pack-objects[1].
1302
074b2eea 1303pack.deltaCacheSize::
02783075 1304 The maximum memory in bytes used for caching deltas in
5749b0b2
NP
1305 linkgit:git-pack-objects[1] before writing them out to a pack.
1306 This cache is used to speed up the writing object phase by not
1307 having to recompute the final delta result once the best match
1308 for all objects is found. Repacking large repositories on machines
1309 which are tight with memory might be badly impacted by this though,
1310 especially if this cache pushes the system into swapping.
1311 A value of 0 means no limit. The smallest size of 1 byte may be
1312 used to virtually disable this cache. Defaults to 256 MiB.
074b2eea 1313
e3dfddb3 1314pack.deltaCacheLimit::
693b86ff 1315 The maximum size of a delta, that is cached in
5749b0b2
NP
1316 linkgit:git-pack-objects[1]. This cache is used to speed up the
1317 writing object phase by not having to recompute the final delta
0cb3c142
NTND
1318 result once the best match for all objects is found.
1319 Defaults to 1000. Maximum value is 65535.
e3dfddb3 1320
693b86ff
NP
1321pack.threads::
1322 Specifies the number of threads to spawn when searching for best
5162e697 1323 delta matches. This requires that linkgit:git-pack-objects[1]
693b86ff
NP
1324 be compiled with pthreads otherwise this option is ignored with a
1325 warning. This is meant to reduce packing time on multiprocessor
1326 machines. The required amount of memory for the delta search window
1327 is however multiplied by the number of threads.
2de9b711 1328 Specifying 0 will cause Git to auto-detect the number of CPU's
833e3df1 1329 and set the number of threads accordingly.
693b86ff 1330
4d00bda2
NP
1331pack.indexVersion::
1332 Specify the default pack index version. Valid values are 1 for
1333 legacy pack index used by Git versions prior to 1.5.2, and 2 for
1334 the new pack index with capabilities for packs larger than 4 GB
1335 as well as proper protection against the repacking of corrupted
c0a5e2d4
NP
1336 packs. Version 2 is the default. Note that version 2 is enforced
1337 and this config option ignored whenever the corresponding pack is
1338 larger than 2 GB.
1339+
2de9b711 1340If you have an old Git that does not understand the version 2 `*.idx` file,
0d0bac67 1341cloning or fetching over a non native protocol (e.g. "http")
6cf378f0 1342that will copy both `*.pack` file and corresponding `*.idx` file from the
c0a5e2d4 1343other side may give you a repository that cannot be accessed with your
2de9b711 1344older version of Git. If the `*.pack` file is smaller than 2 GB, however,
c0a5e2d4 1345you can use linkgit:git-index-pack[1] on the *.pack file to regenerate
6cf378f0 1346the `*.idx` file.
4d00bda2 1347
dbdbfec4 1348pack.packSizeLimit::
07cf0f24
NP
1349 The maximum size of a pack. This setting only affects
1350 packing to a file when repacking, i.e. the git:// protocol
6cf378f0 1351 is unaffected. It can be overridden by the `--max-pack-size`
9cea46cd
EW
1352 option of linkgit:git-repack[1]. Reaching this limit results
1353 in the creation of multiple packfiles; which in turn prevents
1354 bitmaps from being created.
1355 The minimum size allowed is limited to 1 MiB.
1356 The default is unlimited.
07cf0f24
NP
1357 Common unit suffixes of 'k', 'm', or 'g' are
1358 supported.
2b84b5a8 1359
6b8fda2d
VM
1360pack.useBitmaps::
1361 When true, git will use pack bitmaps (if available) when packing
1362 to stdout (e.g., during the server side of a fetch). Defaults to
1363 true. You should not generally need to turn this off unless
1364 you are debugging pack bitmaps.
1365
da0005b8 1366pack.writeBitmaps (deprecated)::
71d76cb4 1367 This is a deprecated synonym for `repack.writeBitmaps`.
7cc8f971 1368
ae4f07fb
VM
1369pack.writeBitmapHashCache::
1370 When true, git will include a "hash cache" section in the bitmap
1371 index (if one is written). This cache can be used to feed git's
1372 delta heuristics, potentially leading to better deltas between
1373 bitmapped and non-bitmapped objects (e.g., when serving a fetch
1374 between an older, bitmapped pack and objects that have been
1375 pushed since the last gc). The downside is that it consumes 4
1376 bytes per object of disk space, and that JGit's bitmap
1377 implementation does not understand it, causing it to complain if
1378 Git and JGit are used on the same repository. Defaults to false.
1379
4370c2d6 1380pager.<cmd>::
9bad7233 1381 If the value is boolean, turns on or off pagination of the
2de9b711 1382 output of a particular Git subcommand when writing to a tty.
9bad7233 1383 Otherwise, turns on pagination for the subcommand using the
6cf378f0
JK
1384 pager specified by the value of `pager.<cmd>`. If `--paginate`
1385 or `--no-pager` is specified on the command line, it takes
9bad7233
JK
1386 precedence over this option. To disable pagination for all
1387 commands, set `core.pager` or `GIT_PAGER` to `cat`.
4370c2d6 1388
8028184e
WP
1389pretty.<name>::
1390 Alias for a --pretty= format string, as specified in
1391 linkgit:git-log[1]. Any aliases defined here can be used just
1392 as the built-in pretty formats could. For example,
6cf378f0 1393 running `git config pretty.changelog "format:* %H %s"`
8028184e 1394 would cause the invocation `git log --pretty=changelog`
6cf378f0 1395 to be equivalent to running `git log "--pretty=format:* %H %s"`.
8028184e
WP
1396 Note that an alias with the same name as a built-in format
1397 will be silently ignored.
1398
f1762d77
BW
1399protocol.allow::
1400 If set, provide a user defined default policy for all protocols which
1401 don't explicitly have a policy (`protocol.<name>.allow`). By default,
1402 if unset, known-safe protocols (http, https, git, ssh, file) have a
1403 default policy of `always`, known-dangerous protocols (ext) have a
1404 default policy of `never`, and all other protocols have a default
1405 policy of `user`. Supported policies:
1406+
1407--
1408
1409* `always` - protocol is always able to be used.
1410
1411* `never` - protocol is never able to be used.
1412
1413* `user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is
1414 either unset or has a value of 1. This policy should be used when you want a
1415 protocol to be directly usable by the user but don't want it used by commands which
1416 execute clone/fetch/push commands without user input, e.g. recursive
1417 submodule initialization.
1418
1419--
1420
1421protocol.<name>.allow::
1422 Set a policy to be used by protocol `<name>` with clone/fetch/push
1423 commands. See `protocol.allow` above for the available policies.
1424+
1425The protocol names currently used by git are:
1426+
1427--
1428 - `file`: any local file-based path (including `file://` URLs,
1429 or local paths)
1430
1431 - `git`: the anonymous git protocol over a direct TCP
1432 connection (or proxy, if configured)
1433
1434 - `ssh`: git over ssh (including `host:path` syntax,
1435 `ssh://`, etc).
1436
1437 - `http`: git over http, both "smart http" and "dumb http".
1438 Note that this does _not_ include `https`; if you want to configure
1439 both, you must do so individually.
1440
1441 - any external helpers are named by their protocol (e.g., use
1442 `hg` to allow the `git-remote-hg` helper)
1443--
1444
373d70ef
BW
1445protocol.version::
1446 Experimental. If set, clients will attempt to communicate with a
1447 server using the specified protocol version. If unset, no
1448 attempt will be made by the client to communicate using a
1449 particular protocol version, this results in protocol version 0
1450 being used.
1451 Supported versions:
1452+
1453--
1454
1455* `0` - the original wire protocol.
1456
1457* `1` - the original wire protocol with the addition of a version string
1458 in the initial response from the server.
1459
db2d36fa
BW
1460* `2` - link:technical/protocol-v2.html[wire protocol version 2].
1461
373d70ef
BW
1462--
1463
04750299 1464include::pull-config.txt[]
d8052750 1465
41b651d6 1466include::push-config.txt[]
b33a15b0 1467
946a9f20 1468include::rebase-config.txt[]
16cf51c7 1469
aaa3b458 1470include::receive-config.txt[]
0a1bc12b 1471
da0005b8 1472remote.pushDefault::
224c2171 1473 The remote to push to by default. Overrides
9f765ce6 1474 `branch.<name>.remote` for all branches, and is overridden by
da0005b8 1475 `branch.<name>.pushRemote` for specific branches.
224c2171 1476
0cc6d346 1477remote.<name>.url::
5162e697
DM
1478 The URL of a remote repository. See linkgit:git-fetch[1] or
1479 linkgit:git-push[1].
0cc6d346 1480
20346234
MG
1481remote.<name>.pushurl::
1482 The push URL of a remote repository. See linkgit:git-push[1].
1483
14c98218
SV
1484remote.<name>.proxy::
1485 For remotes that require curl (http, https and ftp), the URL to
1486 the proxy to use for that remote. Set to the empty string to
1487 disable proxying for that remote.
1488
ef976395
KF
1489remote.<name>.proxyAuthMethod::
1490 For remotes that require curl (http, https and ftp), the method to use for
1491 authenticating against the proxy in use (probably set in
1492 `remote.<name>.proxy`). See `http.proxyAuthMethod`.
1493
0cc6d346 1494remote.<name>.fetch::
5162e697
DM
1495 The default set of "refspec" for linkgit:git-fetch[1]. See
1496 linkgit:git-fetch[1].
0cc6d346
SB
1497
1498remote.<name>.push::
5162e697
DM
1499 The default set of "refspec" for linkgit:git-push[1]. See
1500 linkgit:git-push[1].
0cc6d346 1501
84bb2dfd
PB
1502remote.<name>.mirror::
1503 If true, pushing to this remote will automatically behave
6cf378f0 1504 as if the `--mirror` option was given on the command line.
84bb2dfd 1505
1918278e
TT
1506remote.<name>.skipDefaultUpdate::
1507 If true, this remote will be skipped by default when updating
7cc91a2f
BG
1508 using linkgit:git-fetch[1] or the `update` subcommand of
1509 linkgit:git-remote[1].
1510
1511remote.<name>.skipFetchAll::
1512 If true, this remote will be skipped by default when updating
1513 using linkgit:git-fetch[1] or the `update` subcommand of
1514 linkgit:git-remote[1].
1918278e 1515
060aafc1 1516remote.<name>.receivepack::
5dee29ac 1517 The default program to execute on the remote side when pushing. See
1c262bb7 1518 option --receive-pack of linkgit:git-push[1].
060aafc1 1519
5dee29ac
UKK
1520remote.<name>.uploadpack::
1521 The default program to execute on the remote side when fetching. See
1c262bb7 1522 option --upload-pack of linkgit:git-fetch-pack[1].
5dee29ac 1523
da0005b8 1524remote.<name>.tagOpt::
1c262bb7
JK
1525 Setting this value to --no-tags disables automatic tag following when
1526 fetching from remote <name>. Setting it to --tags will fetch every
944163a4 1527 tag from remote <name>, even if they are not reachable from remote
ed368546 1528 branch heads. Passing these flags directly to linkgit:git-fetch[1] can
1c262bb7 1529 override this setting. See options --tags and --no-tags of
ed368546 1530 linkgit:git-fetch[1].
047f636d 1531
c578f51d 1532remote.<name>.vcs::
2de9b711 1533 Setting this to a value <vcs> will cause Git to interact with
c578f51d
DB
1534 the remote with the git-remote-<vcs> helper.
1535
737c5a9c
MS
1536remote.<name>.prune::
1537 When set to true, fetching from this remote by default will also
0838bf47
MH
1538 remove any remote-tracking references that no longer exist on the
1539 remote (as if the `--prune` option was given on the command line).
737c5a9c
MS
1540 Overrides `fetch.prune` settings, if any.
1541
97716d21
ÆAB
1542remote.<name>.pruneTags::
1543 When set to true, fetching from this remote by default will also
1544 remove any local tags that no longer exist on the remote if pruning
1545 is activated in general via `remote.<name>.prune`, `fetch.prune` or
1546 `--prune`. Overrides `fetch.pruneTags` settings, if any.
627a129b
ÆAB
1547+
1548See also `remote.<name>.prune` and the PRUNING section of
1549linkgit:git-fetch[1].
737c5a9c 1550
1918278e
TT
1551remotes.<group>::
1552 The list of remotes which are fetched by "git remote update
5162e697 1553 <group>". See linkgit:git-remote[1].
1918278e 1554
da0005b8 1555repack.useDeltaBaseOffset::
22c79eab
NP
1556 By default, linkgit:git-repack[1] creates packs that use
1557 delta-base offset. If you need to share your repository with
2de9b711 1558 Git older than version 1.4.4, either directly or via a dumb
22c79eab 1559 protocol such as http, then you need to set this option to
2de9b711 1560 "false" and repack. Access from old Git versions over the
22c79eab 1561 native protocol are unaffected by this option.
b6945f57 1562
ee34a2be
JK
1563repack.packKeptObjects::
1564 If set to true, makes `git repack` act as if
1565 `--pack-kept-objects` was passed. See linkgit:git-repack[1] for
1566 details. Defaults to `false` normally, but `true` if a bitmap
1567 index is being written (either via `--write-bitmap-index` or
71d76cb4
JK
1568 `repack.writeBitmaps`).
1569
16d75fa4
JK
1570repack.useDeltaIslands::
1571 If set to true, makes `git repack` act as if `--delta-islands`
1572 was passed. Defaults to `false`.
1573
71d76cb4
JK
1574repack.writeBitmaps::
1575 When true, git will write a bitmap index when packing all
1576 objects to disk (e.g., when `git repack -a` is run). This
1577 index can speed up the "counting objects" phase of subsequent
1578 packs created for clones and fetches, at the cost of some disk
9cea46cd
EW
1579 space and extra time spent on the initial repack. This has
1580 no effect if multiple packfiles are created.
1581 Defaults to false.
ee34a2be 1582
da0005b8 1583rerere.autoUpdate::
b0f34c3d
MM
1584 When set to true, `git-rerere` updates the index with the
1585 resulting contents after it cleanly resolves conflicts using
1586 previously recorded resolution. Defaults to false.
1587
1588rerere.enabled::
1589 Activate recording of resolved conflicts, so that identical
07b88a00
TR
1590 conflict hunks can be resolved automatically, should they be
1591 encountered again. By default, linkgit:git-rerere[1] is
1592 enabled if there is an `rr-cache` directory under the
b6fb7fed
JH
1593 `$GIT_DIR`, e.g. if "rerere" was previously used in the
1594 repository.
b0f34c3d 1595
4c3abd05
BP
1596reset.quiet::
1597 When set to true, 'git reset' will default to the '--quiet' option.
1598
701137ee 1599include::sendemail-config.txt[]
5453b83b 1600
8dc9d22d
NTND
1601sequence.editor::
1602 Text editor used by `git rebase -i` for editing the rebase instruction file.
1603 The value is meant to be interpreted by the shell when it is used.
1604 It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
1605 When not configured the default commit message editor is used instead.
1606
8da2f489 1607showBranch.default::
5162e697
DM
1608 The default set of branches for linkgit:git-show-branch[1].
1609 See linkgit:git-show-branch[1].
1ab661dd 1610
e77cf4ee
CC
1611splitIndex.maxPercentChange::
1612 When the split index feature is used, this specifies the
1613 percent of entries the split index can contain compared to the
1614 total number of entries in both the split index and the shared
1615 index before a new shared index is written.
1616 The value should be between 0 and 100. If the value is 0 then
1617 a new shared index is always written, if it is 100 a new
1618 shared index is never written.
1619 By default the value is 20, so a new shared index is written
1620 if the number of entries in the split index would be greater
1621 than 20 percent of the total number of entries.
1622 See linkgit:git-update-index[1].
1623
b2dd1c5c
CC
1624splitIndex.sharedIndexExpire::
1625 When the split index feature is used, shared index files that
1626 were not modified since the time this variable specifies will
1627 be removed when a new shared index file is created. The value
1628 "now" expires all entries immediately, and "never" suppresses
1629 expiration altogether.
1630 The default value is "2.weeks.ago".
1631 Note that a shared index file is considered modified (for the
1632 purpose of expiration) each time a new split-index file is
b4601395 1633 either created based on it or read from it.
b2dd1c5c
CC
1634 See linkgit:git-update-index[1].
1635
46f721c8 1636status.relativePaths::
5162e697 1637 By default, linkgit:git-status[1] shows paths relative to the
46f721c8 1638 current directory. Setting this variable to `false` shows paths
2de9b711 1639 relative to the repository root (this was the default for Git
46f721c8
JK
1640 prior to v1.5.4).
1641
4fb5166a
JJGG
1642status.short::
1643 Set to true to enable --short by default in linkgit:git-status[1].
1644 The option --no-short takes precedence over this variable.
1645
ec85d070
JJGG
1646status.branch::
1647 Set to true to enable --branch by default in linkgit:git-status[1].
1648 The option --no-branch takes precedence over this variable.
1649
2556b996
MM
1650status.displayCommentPrefix::
1651 If set to true, linkgit:git-status[1] will insert a comment
1652 prefix before each output line (starting with
1653 `core.commentChar`, i.e. `#` by default). This was the
1654 behavior of linkgit:git-status[1] in Git 1.8.4 and previous.
1655 Defaults to false.
1656
e8b2dc2c
BP
1657status.renameLimit::
1658 The number of files to consider when performing rename detection
1659 in linkgit:git-status[1] and linkgit:git-commit[1]. Defaults to
1660 the value of diff.renameLimit.
1661
1662status.renames::
1663 Whether and how Git detects renames in linkgit:git-status[1] and
1664 linkgit:git-commit[1] . If set to "false", rename detection is
1665 disabled. If set to "true", basic rename detection is enabled.
1666 If set to "copies" or "copy", Git will detect copies, as well.
1667 Defaults to the value of diff.renames.
1668
c1b5d019
LB
1669status.showStash::
1670 If set to true, linkgit:git-status[1] will display the number of
1671 entries currently stashed away.
1672 Defaults to false.
1673
d6293d1f
MSO
1674status.showUntrackedFiles::
1675 By default, linkgit:git-status[1] and linkgit:git-commit[1] show
1676 files which are not currently tracked by Git. Directories which
1677 contain only untracked files, are shown with the directory name
1678 only. Showing untracked files means that Git needs to lstat() all
71069cdf 1679 the files in the whole repository, which might be slow on some
d6293d1f
MSO
1680 systems. So, this variable controls how the commands displays
1681 the untracked files. Possible values are:
1682+
1683--
9373bdc4
CF
1684* `no` - Show no untracked files.
1685* `normal` - Show untracked files and directories.
1686* `all` - Show also individual files in untracked directories.
d6293d1f
MSO
1687--
1688+
1689If this variable is not specified, it defaults to 'normal'.
1690This variable can be overridden with the -u|--untracked-files option
1691of linkgit:git-status[1] and linkgit:git-commit[1].
1692
da0005b8 1693status.submoduleSummary::
4b2343fa
MG
1694 Defaults to false.
1695 If this is set to a non zero number or true (identical to -1 or an
1696 unlimited number), the submodule summary will be enabled and a
1697 summary of commits for modified submodules will be shown (see
bb58b696
JL
1698 --summary-limit option of linkgit:git-submodule[1]). Please note
1699 that the summary output command will be suppressed for all
1700 submodules when `diff.ignoreSubmodules` is set to 'all' or only
1d2f393a
JL
1701 for those submodules where `submodule.<name>.ignore=all`. The only
1702 exception to that rule is that status and commit will show staged
1703 submodule changes. To
bb58b696 1704 also view the summary for ignored submodules you can either use
06ab60c0 1705 the --ignore-submodules=dirty command-line option or the 'git
bb58b696
JL
1706 submodule summary' command, which shows a similar output but does
1707 not honor these settings.
4b2343fa 1708
3086c064
NK
1709stash.showPatch::
1710 If this is set to true, the `git stash show` command without an
e01db917 1711 option will show the stash entry in patch form. Defaults to false.
3086c064
NK
1712 See description of 'show' command in linkgit:git-stash[1].
1713
1714stash.showStat::
1715 If this is set to true, the `git stash show` command without an
e01db917 1716 option will show diffstat of the stash entry. Defaults to true.
3086c064
NK
1717 See description of 'show' command in linkgit:git-stash[1].
1718
6014363f 1719include::submodule-config.txt[]
31224cbd 1720
61c2fe0c
LA
1721tag.forceSignAnnotated::
1722 A boolean to specify whether annotated tags created should be GPG signed.
1723 If `--annotate` is specified on the command line, it takes
1724 precedence over this option.
1725
b150794d
JK
1726tag.sort::
1727 This variable controls the sort ordering of tags when displayed by
1728 linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the
1729 value of this variable will be used as the default.
1730
ce1a79b6 1731tar.umask::
687157c7
RS
1732 This variable can be used to restrict the permission bits of
1733 tar archive entries. The default is 0002, which turns off the
1734 world write bit. The special value "user" indicates that the
1735 archiving user's umask will be used instead. See umask(2) and
5162e697 1736 linkgit:git-archive[1].
ce1a79b6 1737
dab76d3a
JH
1738transfer.fsckObjects::
1739 When `fetch.fsckObjects` or `receive.fsckObjects` are
1740 not set, the value of this variable is used instead.
1741 Defaults to false.
5180dd2e
ÆAB
1742+
1743When set, the fetch or receive will abort in the case of a malformed
456bab87
ÆAB
1744object or a link to a nonexistent object. In addition, various other
1745issues are checked for, including legacy issues (see `fsck.<msg-id>`),
1746and potential security issues like the existence of a `.GIT` directory
1747or a malicious `.gitmodules` file (see the release notes for v2.2.1
1748and v2.17.1 for details). Other sanity and security checks may be
1749added in future releases.
1750+
1751On the receiving side, failing fsckObjects will make those objects
1752unreachable, see "QUARANTINE ENVIRONMENT" in
1753linkgit:git-receive-pack[1]. On the fetch side, malformed objects will
1754instead be left unreferenced in the repository.
720dae5a
ÆAB
1755+
1756Due to the non-quarantine nature of the `fetch.fsckObjects`
1757implementation it can not be relied upon to leave the object store
1758clean like `receive.fsckObjects` can.
1759+
1760As objects are unpacked they're written to the object store, so there
1761can be cases where malicious objects get introduced even though the
1762"fetch" failed, only to have a subsequent "fetch" succeed because only
1763new incoming objects are checked, not those that have already been
1764written to the object store. That difference in behavior should not be
1765relied upon. In the future, such objects may be quarantined for
1766"fetch" as well.
1767+
1768For now, the paranoid need to find some way to emulate the quarantine
1769environment if they'd like the same protection as "push". E.g. in the
1770case of an internal mirror do the mirroring in two steps, one to fetch
1771the untrusted objects, and then do a second "push" (which will use the
1772quarantine) to another internal repo, and have internal clients
1773consume this pushed-to repository, or embargo internal fetches and
1774only allow them once a full "fsck" has run (and no new fetches have
1775happened in the meantime).
dab76d3a 1776
da0005b8 1777transfer.hideRefs::
cc118a65
JK
1778 String(s) `receive-pack` and `upload-pack` use to decide which
1779 refs to omit from their initial advertisements. Use more than
1780 one definition to specify multiple prefix strings. A ref that is
1781 under the hierarchies listed in the value of this variable is
1782 excluded, and is hidden when responding to `git push` or `git
1783 fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for
1784 program-specific versions of this config.
2bc31d16
JK
1785+
1786You may also include a `!` in front of the ref name to negate the entry,
1787explicitly exposing it, even if an earlier entry marked it as hidden.
1788If you have multiple hideRefs values, later entries override earlier ones
1789(and entries in more-specific config files override less-specific ones).
92cab492
LF
1790+
1791If a namespace is in use, the namespace prefix is stripped from each
1792reference before it is matched against `transfer.hiderefs` patterns.
1793For example, if `refs/heads/master` is specified in `transfer.hideRefs` and
1794the current namespace is `foo`, then `refs/namespaces/foo/refs/heads/master`
1795is omitted from the advertisements but `refs/heads/master` and
1796`refs/namespaces/bar/refs/heads/master` are still advertised as so-called
78a766ab
LF
1797"have" lines. In order to match refs before stripping, add a `^` in front of
1798the ref name. If you combine `!` and `^`, `!` must be specified first.
235ec243
MM
1799+
1800Even if you hide refs, a client may still be able to steal the target
1801objects via the techniques described in the "SECURITY" section of the
1802linkgit:gitnamespaces[7] man page; it's best to keep private data in a
1803separate repository.
daebaa78 1804
b0f34c3d
MM
1805transfer.unpackLimit::
1806 When `fetch.unpackLimit` or `receive.unpackLimit` are
1807 not set, the value of this variable is used instead.
1808 The default value is 100.
1809
7671b632
SG
1810uploadarchive.allowUnreachable::
1811 If true, allow clients to use `git archive --remote` to request
1812 any tree, whether reachable from the ref tips or not. See the
235ec243 1813 discussion in the "SECURITY" section of
7671b632
SG
1814 linkgit:git-upload-archive[1] for more details. Defaults to
1815 `false`.
1816
da0005b8 1817uploadpack.hideRefs::
cc118a65
JK
1818 This variable is the same as `transfer.hideRefs`, but applies
1819 only to `upload-pack` (and so affects only fetches, not pushes).
1820 An attempt to fetch a hidden ref by `git fetch` will fail. See
1821 also `uploadpack.allowTipSHA1InWant`.
390eb36b 1822
bc0a4741 1823uploadpack.allowTipSHA1InWant::
da0005b8 1824 When `uploadpack.hideRefs` is in effect, allow `upload-pack`
390eb36b
JH
1825 to accept a fetch request that asks for an object at the tip
1826 of a hidden ref (by default, such a request is rejected).
235ec243
MM
1827 See also `uploadpack.hideRefs`. Even if this is false, a client
1828 may be able to steal objects via the techniques described in the
1829 "SECURITY" section of the linkgit:gitnamespaces[7] man page; it's
1830 best to keep private data in a separate repository.
daebaa78 1831
68ee6289
FM
1832uploadpack.allowReachableSHA1InWant::
1833 Allow `upload-pack` to accept a fetch request that asks for an
1834 object that is reachable from any ref tip. However, note that
1835 calculating object reachability is computationally expensive.
235ec243
MM
1836 Defaults to `false`. Even if this is false, a client may be able
1837 to steal objects via the techniques described in the "SECURITY"
1838 section of the linkgit:gitnamespaces[7] man page; it's best to
1839 keep private data in a separate repository.
68ee6289 1840
f8edeaa0
DT
1841uploadpack.allowAnySHA1InWant::
1842 Allow `upload-pack` to accept a fetch request that asks for any
1843 object at all.
1844 Defaults to `false`.
1845
da0005b8 1846uploadpack.keepAlive::
05e95155
JK
1847 When `upload-pack` has started `pack-objects`, there may be a
1848 quiet period while `pack-objects` prepares the pack. Normally
1849 it would output progress information, but if `--quiet` was used
1850 for the fetch, `pack-objects` will output nothing at all until
1851 the pack data begins. Some clients and networks may consider
1852 the server to be hung and give up. Setting this option instructs
1853 `upload-pack` to send an empty keepalive packet every
da0005b8 1854 `uploadpack.keepAlive` seconds. Setting this option to 0
115dedd7 1855 disables keepalive packets entirely. The default is 5 seconds.
05e95155 1856
20b20a22
JK
1857uploadpack.packObjectsHook::
1858 If this option is set, when `upload-pack` would run
1859 `git pack-objects` to create a packfile for a client, it will
1860 run this shell command instead. The `pack-objects` command and
1861 arguments it _would_ have run (including the `git pack-objects`
1862 at the beginning) are appended to the shell command. The stdin
1863 and stdout of the hook are treated as if `pack-objects` itself
1864 was run. I.e., `upload-pack` will feed input intended for
1865 `pack-objects` to the hook, and expects a completed packfile on
1866 stdout.
1867+
1868Note that this configuration variable is ignored if it is seen in the
1869repository-level config (this is a safety measure against fetching from
1870untrusted repositories).
1871
e56b5355
NTND
1872uploadpack.allowFilter::
1873 If this option is set, `upload-pack` will support partial
1874 clone and partial fetch object filtering.
1875
516e2b76
BW
1876uploadpack.allowRefInWant::
1877 If this option is set, `upload-pack` will support the `ref-in-want`
1878 feature of the protocol version 2 `fetch` command. This feature
1879 is intended for the benefit of load-balanced servers which may
1880 not have the same view of what OIDs their refs point to due to
1881 replication delay.
1882
55029ae4
DB
1883url.<base>.insteadOf::
1884 Any URL that starts with this value will be rewritten to
1885 start, instead, with <base>. In cases where some site serves a
1886 large number of repositories, and serves them with multiple
1887 access methods, and some users need to use different access
1888 methods, this feature allows people to specify any of the
2de9b711 1889 equivalent URLs and have Git automatically rewrite the URL to
55029ae4 1890 the best alternative for the particular user, even for a
844112ca
JH
1891 never-before-seen repository on the site. When more than one
1892 insteadOf strings match a given URL, the longest match is used.
2c9a2ae2
JK
1893+
1894Note that any protocol restrictions will be applied to the rewritten
1895URL. If the rewrite changes the URL to use a custom protocol or remote
1896helper, you may need to adjust the `protocol.*.allow` config to permit
1897the request. In particular, protocols you expect to use for submodules
1898must be set to `always` rather than the default of `user`. See the
1899description of `protocol.allow` above.
55029ae4 1900
1c2eafb8
JT
1901url.<base>.pushInsteadOf::
1902 Any URL that starts with this value will not be pushed to;
1903 instead, it will be rewritten to start with <base>, and the
1904 resulting URL will be pushed to. In cases where some site serves
1905 a large number of repositories, and serves them with multiple
1906 access methods, some of which do not allow push, this feature
2de9b711 1907 allows people to specify a pull-only URL and have Git
1c2eafb8
JT
1908 automatically use an appropriate URL to push, even for a
1909 never-before-seen repository on the site. When more than one
1910 pushInsteadOf strings match a given URL, the longest match is
2de9b711 1911 used. If a remote has an explicit pushurl, Git will ignore this
1c2eafb8
JT
1912 setting for that remote.
1913
1ab661dd
PB
1914user.email::
1915 Your email address to be recorded in any newly created commits.
eee7f4a2 1916 Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and
47d81b5c 1917 `EMAIL` environment variables. See linkgit:git-commit-tree[1].
1ab661dd
PB
1918
1919user.name::
1920 Your full name to be recorded in any newly created commits.
eee7f4a2 1921 Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME`
5162e697 1922 environment variables. See linkgit:git-commit-tree[1].
1ab661dd 1923
4d5c2956 1924user.useConfigOnly::
ae9f6311
TR
1925 Instruct Git to avoid trying to guess defaults for `user.email`
1926 and `user.name`, and instead retrieve the values only from the
4d5c2956
DA
1927 configuration. For example, if you have multiple email addresses
1928 and would like to use a different one for each repository, then
1929 with this configuration option set to `true` in the global config
1930 along with a name, Git will prompt you to set up an email before
1931 making new commits in a newly cloned repository.
1932 Defaults to `false`.
1933
da0005b8 1934user.signingKey::
f0551693
NV
1935 If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the
1936 key you want it to automatically when creating a signed tag or
1937 commit, you can override the default selection with this variable.
1938 This option is passed unchanged to gpg's --local-user parameter,
1939 so you may specify a key using any method that gpg supports.
d67778ec 1940
c026557a
SG
1941versionsort.prereleaseSuffix (deprecated)::
1942 Deprecated alias for `versionsort.suffix`. Ignored if
1943 `versionsort.suffix` is set.
1944
1945versionsort.suffix::
1946 Even when version sort is used in linkgit:git-tag[1], tagnames
1947 with the same base version but different suffixes are still sorted
1948 lexicographically, resulting e.g. in prerelease tags appearing
1949 after the main release (e.g. "1.0-rc1" after "1.0"). This
1950 variable can be specified to determine the sorting order of tags
1951 with different suffixes.
1952+
1953By specifying a single suffix in this variable, any tagname containing
1954that suffix will appear before the corresponding main release. E.g. if
1955the variable is set to "-rc", then all "1.0-rcX" tags will appear before
1956"1.0". If specified multiple times, once per suffix, then the order of
1957suffixes in the configuration will determine the sorting order of tagnames
1958with those suffixes. E.g. if "-pre" appears before "-rc" in the
1959configuration, then all "1.0-preX" tags will be listed before any
1960"1.0-rcX" tags. The placement of the main release tag relative to tags
1961with various suffixes can be determined by specifying the empty suffix
1962among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and
1963"-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags
1964are listed first, followed by "v4.8", then "v4.8-ckX" and finally
1965"v4.8-bfsX".
1966+
b8231660 1967If more than one suffixes match the same tagname, then that tagname will
51acfa9d
SG
1968be sorted according to the suffix which starts at the earliest position in
1969the tagname. If more than one different matching suffixes start at
1970that earliest position, then that tagname will be sorted according to the
1971longest of those suffixes.
b8231660
SG
1972The sorting order between different suffixes is undefined if they are
1973in multiple config files.
d811c8e1 1974
983a9eeb
CC
1975web.browser::
1976 Specify a web browser that may be used by some commands.
1977 Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
1978 may use it.
e92445a7
TG
1979
1980worktree.guessRemote::
1981 With `add`, if no branch argument, and neither of `-b` nor
1982 `-B` nor `--detach` are given, the command defaults to
1983 creating a new branch from HEAD. If `worktree.guessRemote` is
1984 set to true, `worktree add` tries to find a remote-tracking
1985 branch whose name uniquely matches the new branch name. If
1986 such a branch exists, it is checked out and set as "upstream"
1987 for the new branch. If no such match can be found, it falls
1988 back to creating a new branch from the current HEAD.