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