Allow custom "comment char"
[git/git.git] / Documentation / config.txt
CommitLineData
1ab661dd
PB
1CONFIGURATION FILE
2------------------
3
4The git configuration file contains a number of variables that affect
773002a7 5the git command's 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
b7ee2266
SB
11The configuration variables are used by both the git plumbing
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
17variables may appear multiple times.
1ab661dd 18
e136f33b
JN
19Syntax
20~~~~~~
21
1ab661dd 22The syntax is fairly flexible and permissive; whitespaces are mostly
e136f33b
JN
23ignored. The '#' and ';' characters begin comments to the end of line,
24blank lines are ignored.
25
26The file consists of sections and variables. A section begins with
27the name of the section in square brackets and continues until the next
28section begins. Section names are not case sensitive. Only alphanumeric
dcb11263 29characters, `-` and `.` are allowed in section names. Each variable
773002a7
SB
30must belong to some section, which means that there must be a section
31header before the first setting of a variable.
e136f33b
JN
32
33Sections can be further divided into subsections. To begin a subsection
34put its name in double quotes, separated by space from the section name,
773002a7 35in the section header, like in the example below:
e136f33b
JN
36
37--------
38 [section "subsection"]
39
40--------
41
b7ee2266
SB
42Subsection names are case sensitive and can contain any characters except
43newline (doublequote `"` and backslash have to be escaped as `\"` and `\\`,
44respectively). Section headers cannot span multiple
e136f33b
JN
45lines. Variables may belong directly to a section or to a given subsection.
46You can have `[section]` if you have `[section "subsection"]`, but you
47don't need to.
48
f7376329
CMN
49There is also a deprecated `[section.subsection]` syntax. With this
50syntax, the subsection name is converted to lower-case and is also
51compared case sensitively. These subsection names follow the same
52restrictions as section names.
e136f33b 53
2ceb639f
NS
54All the other lines (and the remainder of the line after the section
55header) are recognized as setting variables, in the form
e136f33b
JN
56'name = value'. If there is no equal sign on the line, the entire line
57is taken as 'name' and the variable is recognized as boolean "true".
e0a4aae8
LP
58The variable names are case-insensitive, allow only alphanumeric characters
59and `-`, and must start with an alphabetic character. There can be more
60than one value for a given variable; we say then that the variable is
61multivalued.
e136f33b
JN
62
63Leading and trailing whitespace in a variable value is discarded.
64Internal whitespace within a variable value is retained verbatim.
65
66The values following the equals sign in variable assign are all either
67a string, an integer, or a boolean. Boolean values may be given as yes/no,
18b19e44 681/0, true/false or on/off. Case is not significant in boolean values, when
e136f33b 69converting value to the canonical form using '--bool' type specifier;
0b444cdb 70'git config' will ensure that the output is "true" or "false".
e136f33b
JN
71
72String values may be entirely or partially enclosed in double quotes.
773002a7
SB
73You need to enclose variable values in double quotes if you want to
74preserve leading or trailing whitespace, or if the variable value contains
75comment characters (i.e. it contains '#' or ';').
76Double quote `"` and backslash `\` characters in variable values must
dcb11263 77be escaped: use `\"` for `"` and `\\` for `\`.
e136f33b 78
dcb11263
CJ
79The following escape sequences (beside `\"` and `\\`) are recognized:
80`\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
81and `\b` for backspace (BS). No other char escape sequence, nor octal
e136f33b
JN
82char sequences are valid.
83
773002a7 84Variable values ending in a `\` are continued on the next line in the
e136f33b
JN
85customary UNIX fashion.
86
773002a7 87Some variables may require a special value format.
1ab661dd 88
9b25a0b5
JK
89Includes
90~~~~~~~~
91
92You can include one config file from another by setting the special
93`include.path` variable to the name of the file to be included. The
94included file is expanded immediately, as if its contents had been
95found at the location of the include directive. If the value of the
96`include.path` variable is a relative path, the path is considered to be
97relative to the configuration file in which the include directive was
9a7b0bca
JK
98found. The value of `include.path` is subject to tilde expansion: `~/`
99is expanded to the value of `$HOME`, and `~user/` to the specified
4c0a89fc 100user's home directory. See below for examples.
9b25a0b5 101
1ab661dd
PB
102Example
103~~~~~~~
104
105 # Core variables
106 [core]
107 ; Don't trust file modes
108 filemode = false
109
110 # Our diff algorithm
111 [diff]
6bb9e51b 112 external = /usr/local/bin/diff-wrapper
1ab661dd
PB
113 renames = true
114
910c00c8
AK
115 [branch "devel"]
116 remote = origin
117 merge = refs/heads/devel
118
e136f33b
JN
119 # Proxy settings
120 [core]
29093c28 121 gitProxy="ssh" for "kernel.org"
e136f33b 122 gitProxy=default-proxy ; for the rest
910c00c8 123
9b25a0b5
JK
124 [include]
125 path = /path/to/foo.inc ; include by absolute path
126 path = foo ; expand "foo" relative to the current file
4c0a89fc 127 path = ~/foo ; expand "foo" in your $HOME directory
9b25a0b5 128
1ab661dd
PB
129Variables
130~~~~~~~~~
131
132Note that this list is non-comprehensive and not necessarily complete.
b8936cf0
FD
133For command-specific variables, you will find a more detailed description
134in the appropriate manual page. You will find a description of non-core
1ab661dd
PB
135porcelain configuration variables in the respective porcelain documentation.
136
75194438 137advice.*::
26e94af0
JH
138 These variables control various optional help messages designed to
139 aid new users. All 'advice.*' variables default to 'true', and you
140 can tell Git that you do not need help by setting these to 'false':
75194438
JK
141+
142--
1184564e 143 pushUpdateRejected::
f25950f3 144 Set this variable to 'false' if you want to disable
b4505682
CR
145 'pushNonFFCurrent', 'pushNonFFDefault',
146 'pushNonFFMatching', and 'pushAlreadyExists'
147 simultaneously.
f25950f3
CT
148 pushNonFFCurrent::
149 Advice shown when linkgit:git-push[1] fails due to a
150 non-fast-forward update to the current branch.
151 pushNonFFDefault::
152 Advice to set 'push.default' to 'upstream' or 'current'
153 when you ran linkgit:git-push[1] and pushed 'matching
154 refs' by default (i.e. you did not provide an explicit
155 refspec, and no 'push.default' configuration was set)
156 and it resulted in a non-fast-forward error.
157 pushNonFFMatching::
158 Advice shown when you ran linkgit:git-push[1] and pushed
159 'matching refs' explicitly (i.e. you used ':', or
160 specified a refspec that isn't your current branch) and
161 it resulted in a non-fast-forward error.
b4505682
CR
162 pushAlreadyExists::
163 Shown when linkgit:git-push[1] rejects an update that
164 does not qualify for fast-forwarding (e.g., a tag.)
edf563fb 165 statusHints::
83c750ac 166 Show directions on how to proceed from the current
552755a8 167 state in the output of linkgit:git-status[1], in
83c750ac 168 the template shown when writing commit messages in
552755a8
MM
169 linkgit:git-commit[1], and in the help message shown
170 by linkgit:git-checkout[1] when switching branch.
4c371f91
MM
171 commitBeforeMerge::
172 Advice shown when linkgit:git-merge[1] refuses to
6b677a28 173 merge to avoid overwriting local changes.
d38a30df
MM
174 resolveConflict::
175 Advices shown by various commands when conflicts
176 prevent the operation from being performed.
b706fcfe
JK
177 implicitIdentity::
178 Advice on how to set your identity configuration when
179 your information is guessed from the system username and
26e94af0 180 domain name.
13be3e31 181 detachedHead::
26e94af0 182 Advice shown when you used linkgit:git-checkout[1] to
13be3e31 183 move to the detach HEAD state, to instruct how to create
26e94af0 184 a local branch after the fact.
14bf2d58
PG
185 amWorkDir::
186 Advice that shows the location of the patch file when
187 linkgit:git-am[1] fails to apply it.
75194438
JK
188--
189
1ab661dd
PB
190core.fileMode::
191 If false, the executable bit differences between the index and
f7d650c0 192 the working tree are ignored; useful on broken filesystems like FAT.
7b357240
MO
193 See linkgit:git-update-index[1].
194+
195The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
196will probe and set core.fileMode false if appropriate when the
197repository is created.
1ab661dd 198
adbc0b6b
DP
199core.ignoreCygwinFSTricks::
200 This option is only used by Cygwin implementation of Git. If false,
201 the Cygwin stat() and lstat() functions are used. This may be useful
202 if your repository consists of a few separate directories joined in
203 one hierarchy using Cygwin mount. If true, Git uses native Win32 API
204 whenever it is possible and falls back to Cygwin functions only to
205 handle symbol links. The native mode is more than twice faster than
7faee6b8
ML
206 normal Cygwin l/stat() functions. True by default, unless core.filemode
207 is true, in which case ignoreCygwinFSTricks is ignored as Cygwin's
208 POSIX emulation is required to support core.filemode.
adbc0b6b 209
7b357240
MO
210core.ignorecase::
211 If true, this option enables various workarounds to enable
212 git to work better on filesystems that are not case sensitive,
213 like FAT. For example, if a directory listing finds
214 "makefile" when git expects "Makefile", git will assume
215 it is really the same file, and continue to remember it as
216 "Makefile".
217+
218The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]
219will probe and set core.ignorecase true if appropriate when the repository
220is created.
221
76759c7d
TB
222core.precomposeunicode::
223 This option is only used by Mac OS implementation of git.
224 When core.precomposeunicode=true, git reverts the unicode decomposition
225 of filenames done by Mac OS. This is useful when sharing a repository
226 between Mac OS and Linux or Windows.
227 (Git for Windows 1.7.10 or higher is needed, or git under cygwin 1.7).
228 When false, file names are handled fully transparent by git,
229 which is backward compatible with older versions of git.
230
1ce4790b
AR
231core.trustctime::
232 If false, the ctime differences between the index and the
f7d650c0 233 working tree are ignored; useful when the inode change time
1ce4790b
AR
234 is regularly modified by something outside Git (file system
235 crawlers and some backup systems).
236 See linkgit:git-update-index[1]. True by default.
237
9378c161 238core.quotepath::
5833d730
JN
239 The commands that output paths (e.g. 'ls-files',
240 'diff'), when not given the `-z` option, will quote
9378c161
JH
241 "unusual" characters in the pathname by enclosing the
242 pathname in a double-quote pair and with backslashes the
243 same way strings in C source code are quoted. If this
244 variable is set to false, the bytes higher than 0x80 are
245 not quoted but output as verbatim. Note that double
246 quote, backslash and control characters are always
247 quoted without `-z` regardless of the setting of this
248 variable.
249
942e7747
EB
250core.eol::
251 Sets the line ending type to use in the working directory for
252 files that have the `text` property set. Alternatives are
253 'lf', 'crlf' and 'native', which uses the platform's native
254 line ending. The default value is `native`. See
255 linkgit:gitattributes[5] for more information on end-of-line
256 conversion.
5cb71f82 257
21e5ad50 258core.safecrlf::
fd6cce9e
EB
259 If true, makes git check if converting `CRLF` is reversible when
260 end-of-line conversion is active. Git will verify if a command
21e5ad50
SP
261 modifies a file in the work tree either directly or indirectly.
262 For example, committing a file followed by checking out the
263 same file should yield the original file in the work tree. If
264 this is not the case for the current setting of
265 `core.autocrlf`, git will reject the file. The variable can
266 be set to "warn", in which case git will only warn about an
267 irreversible conversion but continue the operation.
268+
269CRLF conversion bears a slight chance of corrupting data.
942e7747 270When it is enabled, git will convert CRLF to LF during commit and LF to
21e5ad50
SP
271CRLF during checkout. A file that contains a mixture of LF and
272CRLF before the commit cannot be recreated by git. For text
273files this is the right thing to do: it corrects line endings
274such that we have only LF line endings in the repository.
275But for binary files that are accidentally classified as text the
276conversion can corrupt data.
277+
278If you recognize such corruption early you can easily fix it by
279setting the conversion type explicitly in .gitattributes. Right
280after committing you still have the original file in your work
281tree and this file is not yet corrupted. You can explicitly tell
282git that this file is binary and git will handle the file
283appropriately.
284+
285Unfortunately, the desired effect of cleaning up text files with
286mixed line endings and the undesired effect of corrupting binary
287files cannot be distinguished. In both cases CRLFs are removed
288in an irreversible way. For text files this is the right thing
289to do because CRLFs are line endings, while for binary files
290converting CRLFs corrupts data.
291+
292Note, this safety check does not mean that a checkout will generate a
293file identical to the original file for a different setting of
942e7747
EB
294`core.eol` and `core.autocrlf`, but only for the current one. For
295example, a text file with `LF` would be accepted with `core.eol=lf`
296and could later be checked out with `core.eol=crlf`, in which case the
21e5ad50
SP
297resulting file would contain `CRLF`, although the original file
298contained `LF`. However, in both work trees the line endings would be
299consistent, that is either all `LF` or all `CRLF`, but never mixed. A
300file with mixed line endings would be reported by the `core.safecrlf`
301mechanism.
302
942e7747
EB
303core.autocrlf::
304 Setting this variable to "true" is almost the same as setting
305 the `text` attribute to "auto" on all files except that text
306 files are not guaranteed to be normalized: files that contain
307 `CRLF` in the repository will not be touched. Use this
308 setting if you want to have `CRLF` line endings in your
309 working directory even though the repository does not have
310 normalized line endings. This variable can be set to 'input',
311 in which case no output conversion is performed.
312
78a8d641
JS
313core.symlinks::
314 If false, symbolic links are checked out as small plain files that
5162e697
DM
315 contain the link text. linkgit:git-update-index[1] and
316 linkgit:git-add[1] will not change the recorded type to regular
78a8d641 317 file. Useful on filesystems like FAT that do not support
7b357240
MO
318 symbolic links.
319+
320The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
321will probe and set core.symlinks false if appropriate when the repository
322is created.
78a8d641 323
1ab661dd
PB
324core.gitProxy::
325 A "proxy command" to execute (as 'command host port') instead
326 of establishing direct connection to the remote server when
327 using the git protocol for fetching. If the variable value is
328 in the "COMMAND for DOMAIN" format, the command is applied only
329 on hostnames ending with the specified domain string. This variable
330 may be set multiple times and is matched in the given order;
331 the first match wins.
b8936cf0
FD
332+
333Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
334(which always applies universally, without the special "for"
335handling).
642d0844
ES
336+
337The special string `none` can be used as the proxy command to
338specify that no proxy be used for a given domain pattern.
339This is useful for excluding servers inside a firewall from
340proxy use, while defaulting to a common proxy for external domains.
1ab661dd
PB
341
342core.ignoreStat::
b7f685a7
MSO
343 If true, commands which modify both the working tree and the index
344 will mark the updated paths with the "assume unchanged" bit in the
345 index. These marked files are then assumed to stay unchanged in the
f7d650c0 346 working tree, until you mark them otherwise manually - Git will not
b7f685a7
MSO
347 detect the file changes by lstat() calls. This is useful on systems
348 where those are very slow, such as Microsoft Windows.
349 See linkgit:git-update-index[1].
1ab661dd
PB
350 False by default.
351
9f0bb90d
JH
352core.preferSymlinkRefs::
353 Instead of the default "symref" format for HEAD
354 and other symbolic reference files, use symbolic links.
355 This is sometimes needed to work with old scripts that
356 expect HEAD to be a symbolic link.
1ab661dd 357
e4a15f40
SP
358core.bare::
359 If true this repository is assumed to be 'bare' and has no
360 working directory associated with it. If this is the case a
361 number of commands that require a working directory will be
5162e697 362 disabled, such as linkgit:git-add[1] or linkgit:git-merge[1].
e4a15f40 363+
5162e697
DM
364This setting is automatically guessed by linkgit:git-clone[1] or
365linkgit:git-init[1] when the repository was created. By default a
e4a15f40
SP
366repository that ends in "/.git" is assumed to be not bare (bare =
367false), while all other repositories are assumed to be bare (bare
368= true).
369
892c41b9 370core.worktree::
ea472c1e 371 Set the path to the root of the working tree.
06ada152 372 This can be overridden by the GIT_WORK_TREE environment
ea472c1e 373 variable and the '--work-tree' command line option.
d424a47e 374 The value can be an absolute path or relative to the path to
ea472c1e
JH
375 the .git directory, which is either specified by --git-dir
376 or GIT_DIR, or automatically discovered.
377 If --git-dir or GIT_DIR is specified but none of
302cc11a 378 --work-tree, GIT_WORK_TREE and core.worktree is specified,
ea472c1e 379 the current working directory is regarded as the top level
98acf759 380 of your working tree.
ea472c1e
JH
381+
382Note that this variable is honored even when set in a configuration
383file in a ".git" subdirectory of a directory and its value differs
384from the latter directory (e.g. "/path/to/.git/config" has
385core.worktree set to "/different/path"), which is most likely a
386misconfiguration. Running git commands in the "/path/to" directory will
387still use "/different/path" as the root of the work tree and can cause
388confusion unless you know what you are doing (e.g. you are creating a
389read-only snapshot of the same index to a location different from the
390repository's usual working tree).
892c41b9 391
6de08ae6 392core.logAllRefUpdates::
14cd5607 393 Enable the reflog. Updates to a ref <ref> is logged to the file
4057deb5
JH
394 "$GIT_DIR/logs/<ref>", by appending the new and old
395 SHA1, the date/time and the reason of the update, but
396 only when the file exists. If this configuration
397 variable is set to true, missing "$GIT_DIR/logs/<ref>"
cd8e3711
BW
398 file is automatically created for branch heads (i.e. under
399 refs/heads/), remote refs (i.e. under refs/remotes/),
400 note refs (i.e. under refs/notes/), and the symbolic ref HEAD.
a862f97e
JH
401+
402This information can be used to determine what commit
403was the tip of a branch "2 days ago".
404+
405This value is true by default in a repository that has
406a working directory associated with it, and false by
407default in a bare repository.
6de08ae6 408
1ab661dd
PB
409core.repositoryFormatVersion::
410 Internal variable identifying the repository format and layout
411 version.
412
413core.sharedRepository::
d5dc6a76
JF
414 When 'group' (or 'true'), the repository is made shareable between
415 several users in a group (making sure all the files and objects are
416 group-writable). When 'all' (or 'world' or 'everybody'), the
417 repository will be readable by all users, additionally to being
418 group-shareable. When 'umask' (or 'false'), git will use permissions
06cbe855
HO
419 reported by umask(2). When '0xxx', where '0xxx' is an octal number,
420 files in the repository will have this mode value. '0xxx' will override
098082fb
JH
421 user's umask value (whereas the other options will only override
422 requested parts of the user's umask value). Examples: '0660' will make
423 the repo read/write-able for the owner and group, but inaccessible to
424 others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a
06cbe855
HO
425 repository that is group-readable but not group-writable.
426 See linkgit:git-init[1]. False by default.
1ab661dd
PB
427
428core.warnAmbiguousRefs::
429 If true, git will warn you if the ref name you passed it is ambiguous
430 and might match multiple refs in the .git/refs/ tree. True by default.
431
3d3e95af 432core.compression::
960ccca6
DH
433 An integer -1..9, indicating a default compression level.
434 -1 is the zlib default. 0 means no compression,
435 and 1..9 are various speed/size tradeoffs, 9 being slowest.
dec92309
BD
436 If set, this provides a default to other compression variables,
437 such as 'core.loosecompression' and 'pack.compression'.
960ccca6
DH
438
439core.loosecompression::
12f6c308 440 An integer -1..9, indicating the compression level for objects that
960ccca6 441 are not in a pack file. -1 is the zlib default. 0 means no
12f6c308 442 compression, and 1..9 are various speed/size tradeoffs, 9 being
960ccca6 443 slowest. If not set, defaults to core.compression. If that is
de1b2460 444 not set, defaults to 1 (best speed).
12f6c308 445
60bb8b14
SP
446core.packedGitWindowSize::
447 Number of bytes of a pack file to map into memory in a
448 single mapping operation. Larger window sizes may allow
449 your system to process a smaller number of large pack files
450 more quickly. Smaller window sizes will negatively affect
eb92242f 451 performance due to increased calls to the operating system's
60bb8b14 452 memory manager, but may improve performance when accessing
22bac0ea
SP
453 a large number of large pack files.
454+
455Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32
456MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should
457be reasonable for all users/operating systems. You probably do
458not need to adjust this value.
eb92242f
SP
459+
460Common unit suffixes of 'k', 'm', or 'g' are supported.
60bb8b14 461
77ccc5bb
SP
462core.packedGitLimit::
463 Maximum number of bytes to map simultaneously into memory
464 from pack files. If Git needs to access more than this many
465 bytes at once to complete an operation it will unmap existing
466 regions to reclaim virtual address space within the process.
22bac0ea
SP
467+
468Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms.
469This should be reasonable for all users/operating systems, except on
470the largest projects. You probably do not need to adjust this value.
eb92242f
SP
471+
472Common unit suffixes of 'k', 'm', or 'g' are supported.
77ccc5bb 473
18bdec11
SP
474core.deltaBaseCacheLimit::
475 Maximum number of bytes to reserve for caching base objects
6b677a28 476 that may be referenced by multiple deltified objects. By storing the
18bdec11
SP
477 entire decompressed base objects in a cache Git is able
478 to avoid unpacking and decompressing frequently used base
479 objects multiple times.
480+
481Default is 16 MiB on all platforms. This should be reasonable
482for all users/operating systems, except on the largest projects.
483You probably do not need to adjust this value.
484+
485Common unit suffixes of 'k', 'm', or 'g' are supported.
486
5eef828b
SP
487core.bigFileThreshold::
488 Files larger than this size are stored deflated, without
489 attempting delta compression. Storing large files without
490 delta compression avoids excessive memory usage, at the
491 slight expense of increased disk usage.
492+
493Default is 512 MiB on all platforms. This should be reasonable
494for most projects as source code and other text files can still
495be delta compressed, but larger binary media files won't be.
496+
497Common unit suffixes of 'k', 'm', or 'g' are supported.
5eef828b 498
e8964a5b 499core.excludesfile::
0ba956d3
JS
500 In addition to '.gitignore' (per-directory) and
501 '.git/info/exclude', git looks into this file for patterns
6cf378f0
JK
502 of files which are not meant to be tracked. "`~/`" is expanded
503 to the value of `$HOME` and "`~user/`" to the specified user's
dc79687e
HKNN
504 home directory. Its default value is $XDG_CONFIG_HOME/git/ignore.
505 If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore
506 is used instead. See linkgit:gitignore[5].
0ba956d3 507
d3e7da89
AK
508core.askpass::
509 Some commands (e.g. svn and http interfaces) that interactively
510 ask for a password can be told to use an external program given
453842c9
KF
511 via the value of this variable. Can be overridden by the 'GIT_ASKPASS'
512 environment variable. If not set, fall back to the value of the
513 'SSH_ASKPASS' environment variable or, failing that, a simple password
514 prompt. The external program shall be given a suitable prompt as
515 command line argument and write the password on its STDOUT.
d3e7da89 516
6df42ab9
PO
517core.attributesfile::
518 In addition to '.gitattributes' (per-directory) and
519 '.git/info/attributes', git looks into this file for attributes
520 (see linkgit:gitattributes[5]). Path expansions are made the same
684e40f6
HKNN
521 way as for `core.excludesfile`. Its default value is
522 $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not
523 set or empty, $HOME/.config/git/attributes is used instead.
6df42ab9 524
ef0c2abf
AR
525core.editor::
526 Commands such as `commit` and `tag` that lets you edit
02783075 527 messages by launching an editor uses the value of this
ef0c2abf 528 variable when it is set, and the environment variable
b4479f07 529 `GIT_EDITOR` is not set. See linkgit:git-var[1].
ef0c2abf 530
eff80a9f
JH
531core.commentchar::
532 Commands such as `commit` and `tag` that lets you edit
533 messages consider a line that begins with this character
534 commented, and removes them after the editor returns
535 (default '#').
536
821881d8
PO
537sequence.editor::
538 Text editor used by `git rebase -i` for editing the rebase insn file.
539 The value is meant to be interpreted by the shell when it is used.
540 It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
541 When not configured the default commit message editor is used instead.
542
54adf370 543core.pager::
ab54cd6c
JN
544 The command that git will use to paginate output. Can
545 be overridden with the `GIT_PAGER` environment
546 variable. Note that git sets the `LESS` environment
547 variable to `FRSX` if it is unset when it runs the
548 pager. One can change these settings by setting the
fee75457
CF
549 `LESS` variable to some other value. Alternately,
550 these settings can be overridden on a project or
551 global basis by setting the `core.pager` option.
3a599b83 552 Setting `core.pager` has no effect on the `LESS`
fee75457
CF
553 environment variable behaviour above, so if you want
554 to override git's default settings this way, you need
555 to be explicit. For example, to disable the S option
556 in a backward compatible manner, set `core.pager`
3a599b83
PP
557 to `less -+S`. This will be passed to the shell by
558 git, which will translate the final command to
559 `LESS=FRSX less -+S`.
54adf370 560
91af7ae5
JH
561core.whitespace::
562 A comma separated list of common whitespace problems to
0b444cdb
TR
563 notice. 'git diff' will use `color.diff.whitespace` to
564 highlight them, and 'git apply --whitespace=error' will
c921cc92
JH
565 consider them as errors. You can prefix `-` to disable
566 any of them (e.g. `-trailing-space`):
91af7ae5 567+
aeb84b05 568* `blank-at-eol` treats trailing whitespaces at the end of the line
91af7ae5
JH
569 as an error (enabled by default).
570* `space-before-tab` treats a space character that appears immediately
571 before a tab character in the initial indent part of the line as an
572 error (enabled by default).
2ce4fee8
WL
573* `indent-with-non-tab` treats a line that is indented with space
574 characters instead of the equivalent tabs as an error (not enabled by
575 default).
3e3ec2ab
CW
576* `tab-in-indent` treats a tab character in the initial indent part of
577 the line as an error (not enabled by default).
77b15bbd
JH
578* `blank-at-eof` treats blank lines added at the end of file as an error
579 (enabled by default).
aeb84b05
JH
580* `trailing-space` is a short-hand to cover both `blank-at-eol` and
581 `blank-at-eof`.
b2979ff5
JH
582* `cr-at-eol` treats a carriage-return at the end of line as
583 part of the line terminator, i.e. with it, `trailing-space`
584 does not trigger if the character before such a carriage-return
585 is not a whitespace (not enabled by default).
f4b05a49
JS
586* `tabwidth=<n>` tells how many character positions a tab occupies; this
587 is relevant for `indent-with-non-tab` and when git fixes `tab-in-indent`
588 errors. The default tab width is 8. Allowed values are 1 to 63.
91af7ae5 589
aafe9fba
LT
590core.fsyncobjectfiles::
591 This boolean will enable 'fsync()' when writing object files.
592+
593This is a total waste of time and effort on a filesystem that orders
594data writes properly, but can be useful for filesystems that do not use
595journalling (traditional UNIX filesystems) or that only journal metadata
596and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
597
671c9b7e
LT
598core.preloadindex::
599 Enable parallel index preload for operations like 'git diff'
600+
601This can speed up operations like 'git diff' and 'git status' especially
602on filesystems like NFS that have weak caching semantics and thus
603relatively high IO latencies. With this set to 'true', git will do the
604index comparison to the filesystem data in parallel, allowing
605overlapping IO's.
606
348df166
JS
607core.createObject::
608 You can set this to 'link', in which case a hardlink followed by
609 a delete of the source are used to make sure that object creation
610 will not overwrite existing objects.
611+
612On some file system/operating system combinations, this is unreliable.
613Set this config setting to 'rename' there; However, This will remove the
614check that makes sure that existing object files will not get overwritten.
be66a6c4 615
a97a7468
JS
616core.notesRef::
617 When showing commit messages, also show notes which are stored in
9eb3f816
JN
618 the given ref. The ref must be fully qualified. If the given
619 ref does not exist, it is not an error but means that no
620 notes should be printed.
a97a7468 621+
9eb3f816
JN
622This setting defaults to "refs/notes/commits", and it can be overridden by
623the 'GIT_NOTES_REF' environment variable. See linkgit:git-notes[1].
a97a7468 624
08aefc9e
NTND
625core.sparseCheckout::
626 Enable "sparse checkout" feature. See section "Sparse checkout" in
627 linkgit:git-read-tree[1] for more information.
628
a71f09fe 629core.abbrev::
dce96489
LT
630 Set the length object names are abbreviated to. If unspecified,
631 many commands abbreviate to 7 hexdigits, which may not be enough
632 for abbreviated object names to stay unique for sufficiently long
633 time.
634
13bd2134 635add.ignore-errors::
6b3020a2 636add.ignoreErrors::
0b444cdb 637 Tells 'git add' to continue adding files when some files cannot be
13bd2134 638 added due to indexing errors. Equivalent to the '--ignore-errors'
6b3020a2
JN
639 option of linkgit:git-add[1]. Older versions of git accept only
640 `add.ignore-errors`, which does not follow the usual naming
641 convention for configuration variables. Newer versions of git
642 honor `add.ignoreErrors` as well.
13bd2134 643
4514ad4f 644alias.*::
5162e697 645 Command aliases for the linkgit:git[1] command wrapper - e.g.
4514ad4f
PB
646 after defining "alias.last = cat-file commit HEAD", the invocation
647 "git last" is equivalent to "git cat-file commit HEAD". To avoid
99b41c84
PB
648 confusion and troubles with script usage, aliases that
649 hide existing git commands are ignored. Arguments are split by
650 spaces, the usual shell quoting and escaping is supported.
651 quote pair and a backslash can be used to quote them.
f368f5a6
JH
652+
653If the alias expansion is prefixed with an exclamation point,
654it will be treated as a shell command. For example, defining
655"alias.new = !gitk --all --not ORIG_HEAD", the invocation
656"git new" is equivalent to running the shell command
595b8dbf
SC
657"gitk --all --not ORIG_HEAD". Note that shell commands will be
658executed from the top-level directory of a repository, which may
659not necessarily be the current directory.
7cf16a14
MG
660'GIT_PREFIX' is set as returned by running 'git rev-parse --show-prefix'
661from the original current directory. See linkgit:git-rev-parse[1].
dfd42a3c 662
e80d4cbe
SH
663am.keepcr::
664 If true, git-am will call git-mailsplit for patches in mbox format
665 with parameter '--keep-cr'. In this case git-mailsplit will
6b677a28 666 not remove `\r` from lines ending with `\r\n`. Can be overridden
e80d4cbe
SH
667 by giving '--no-keep-cr' from the command line.
668 See linkgit:git-am[1], linkgit:git-mailsplit[1].
669
86c91f91 670apply.ignorewhitespace::
0b444cdb 671 When set to 'change', tells 'git apply' to ignore changes in
86c91f91
GB
672 whitespace, in the same way as the '--ignore-space-change'
673 option.
0b444cdb 674 When set to one of: no, none, never, false tells 'git apply' to
86c91f91
GB
675 respect all whitespace differences.
676 See linkgit:git-apply[1].
677
1ab661dd 678apply.whitespace::
0b444cdb 679 Tells 'git apply' how to handle whitespaces, in the same way
5162e697 680 as the '--whitespace' option. See linkgit:git-apply[1].
1ab661dd 681
9902387d 682branch.autosetupmerge::
add0951a 683 Tells 'git branch' and 'git checkout' to set up new branches
572fc81d
JS
684 so that linkgit:git-pull[1] will appropriately merge from the
685 starting point branch. Note that even if this option is not set,
9902387d 686 this behavior can be chosen per-branch using the `--track`
572fc81d
JS
687 and `--no-track` options. The valid settings are: `false` -- no
688 automatic setup is done; `true` -- automatic setup is done when the
29b9a66f
MM
689 starting point is a remote-tracking branch; `always` --
690 automatic setup is done when the starting point is either a
691 local branch or remote-tracking
572fc81d 692 branch. This option defaults to true.
9902387d 693
c998ae9b 694branch.autosetuprebase::
0b444cdb 695 When a new branch is created with 'git branch' or 'git checkout'
c998ae9b
DS
696 that tracks another branch, this variable tells git to set
697 up pull to rebase instead of merge (see "branch.<name>.rebase").
698 When `never`, rebase is never automatically set to true.
699 When `local`, rebase is set to true for tracked branches of
700 other local branches.
701 When `remote`, rebase is set to true for tracked branches of
29b9a66f 702 remote-tracking branches.
c998ae9b
DS
703 When `always`, rebase will be set to true for all tracking
704 branches.
705 See "branch.autosetupmerge" for details on how to set up a
706 branch to track another branch.
707 This option defaults to never.
708
648ad18f 709branch.<name>.remote::
0b444cdb 710 When in branch <name>, it tells 'git fetch' and 'git push' which
76d3cc50
SB
711 remote to fetch from/push to. It defaults to `origin` if no remote is
712 configured. `origin` is also used if you are not on any branch.
648ad18f 713
5372806a 714branch.<name>.merge::
76d3cc50 715 Defines, together with branch.<name>.remote, the upstream branch
15a147e6 716 for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which
0b444cdb
TR
717 branch to merge and can also affect 'git push' (see push.default).
718 When in branch <name>, it tells 'git fetch' the default
b888d61c
DB
719 refspec to be marked for merging in FETCH_HEAD. The value is
720 handled like the remote part of a refspec, and must match a
721 ref which is fetched from the remote given by
722 "branch.<name>.remote".
0b444cdb
TR
723 The merge information is used by 'git pull' (which at first calls
724 'git fetch') to lookup the default branch for merging. Without
725 this option, 'git pull' defaults to merge the first refspec fetched.
62b339a5 726 Specify multiple values to get an octopus merge.
0b444cdb 727 If you wish to setup 'git pull' so that it merges into <name> from
9debc324
PB
728 another branch in the local repository, you can point
729 branch.<name>.merge to the desired branch, and use the special setting
730 `.` (a period) for branch.<name>.remote.
5372806a 731
aec7b362
LH
732branch.<name>.mergeoptions::
733 Sets default options for merging into branch <name>. The syntax and
25dcc0d6 734 supported options are the same as those of linkgit:git-merge[1], but
aec7b362
LH
735 option values containing whitespace characters are currently not
736 supported.
737
cd67e4d4
JS
738branch.<name>.rebase::
739 When true, rebase the branch <name> on top of the fetched branch,
15ddb6fa 740 instead of merging the default branch from the default remote when
6b37dff1
ÆAB
741 "git pull" is run. See "pull.rebase" for doing this in a non
742 branch-specific manner.
743+
744*NOTE*: this is a possibly dangerous operation; do *not* use
745it unless you understand the implications (see linkgit:git-rebase[1]
746for details).
cd67e4d4 747
a5ba2cbe
NTND
748branch.<name>.description::
749 Branch description, can be edited with
750 `git branch --edit-description`. Branch description is
751 automatically added in the format-patch cover letter or
752 request-pull summary.
753
1658c614
CC
754browser.<tool>.cmd::
755 Specify the command to invoke the specified browser. The
756 specified command is evaluated in shell with the URLs passed
565e135a 757 as arguments. (See linkgit:git-web{litdd}browse[1].)
1658c614 758
584627b4
CC
759browser.<tool>.path::
760 Override the path for the given tool that may be used to
ab989adf
CC
761 browse HTML help (see '-w' option in linkgit:git-help[1]) or a
762 working repository in gitweb (see linkgit:git-instaweb[1]).
584627b4 763
2122591b 764clean.requireForce::
562ca192
JH
765 A boolean to make git-clean do nothing unless given -f
766 or -n. Defaults to true.
2122591b 767
f3673988
BG
768color.branch::
769 A boolean to enable/disable color in the output of
5162e697 770 linkgit:git-branch[1]. May be set to `always`,
cec99d8c 771 `false` (or `never`) or `auto` (or `true`), in which case colors are used
f3673988
BG
772 only when the output is to a terminal. Defaults to false.
773
774color.branch.<slot>::
775 Use customized color for branch coloration. `<slot>` is one of
776 `current` (the current branch), `local` (a local branch),
8b3f3f84 777 `remote` (a remote-tracking branch in refs/remotes/), `plain` (other
4f193f20
MW
778 refs).
779+
780The value for these configuration variables is a list of colors (at most
781two) and attributes (at most one), separated by spaces. The colors
782accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
783`magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`,
784`blink` and `reverse`. The first color given is the foreground; the
785second is the background. The position of the attribute, if any,
786doesn't matter.
f3673988 787
a159ca0c 788color.diff::
6999c540
MG
789 Whether to use ANSI escape sequences to add color to patches.
790 If this is set to `always`, linkgit:git-diff[1],
791 linkgit:git-log[1], and linkgit:git-show[1] will use color
792 for all patches. If it is set to `true` or `auto`, those
793 commands will only use color when output is to the terminal.
794 Defaults to false.
795+
796This does not affect linkgit:git-format-patch[1] nor the
797'git-diff-{asterisk}' plumbing commands. Can be overridden on the
798command line with the `--color[=<when>]` option.
b5376648 799
a159ca0c 800color.diff.<slot>::
4f193f20
MW
801 Use customized color for diff colorization. `<slot>` specifies
802 which part of the patch to use the specified color, and is one
803 of `plain` (context text), `meta` (metainformation), `frag`
89cb73a1
BW
804 (hunk header), 'func' (function in hunk header), `old` (removed lines),
805 `new` (added lines), `commit` (commit headers), or `whitespace`
806 (highlighting whitespace errors). The values of these variables may be
807 specified as in color.branch.<slot>.
b5376648 808
5e11bee6
NR
809color.decorate.<slot>::
810 Use customized color for 'git log --decorate' output. `<slot>` is one
811 of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
0e615b25 812 branches, remote-tracking branches, tags, stash and HEAD, respectively.
5e11bee6 813
7e8f59d5
RS
814color.grep::
815 When set to `always`, always highlight matches. When `false` (or
816 `never`), never. When set to `true` or `auto`, use color only
817 when the output is written to the terminal. Defaults to `false`.
818
55f638bd
ML
819color.grep.<slot>::
820 Use customized color for grep colorization. `<slot>` specifies which
821 part of the line to use the specified color, and is one of
822+
823--
00588bb5
ML
824`context`;;
825 non-matching text in context lines (when using `-A`, `-B`, or `-C`)
55f638bd
ML
826`filename`;;
827 filename prefix (when not using `-h`)
00588bb5
ML
828`function`;;
829 function name lines (when using `-p`)
55f638bd
ML
830`linenumber`;;
831 line number prefix (when using `-n`)
832`match`;;
833 matching text
00588bb5
ML
834`selected`;;
835 non-matching text in selected lines
55f638bd
ML
836`separator`;;
837 separators between fields on a line (`:`, `-`, and `=`)
838 and between hunks (`--`)
839--
840+
841The values of these variables may be specified as in color.branch.<slot>.
7e8f59d5 842
b4c61ed6 843color.interactive::
47ee06f1 844 When set to `always`, always use colors for interactive prompts
467c0197 845 and displays (such as those used by "git-add --interactive").
b4c61ed6
JH
846 When false (or `never`), never. When set to `true` or `auto`, use
847 colors only when the output is to the terminal. Defaults to false.
848
849color.interactive.<slot>::
0b444cdb 850 Use customized color for 'git add --interactive'
a3019736
TR
851 output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
852 four distinct types of normal output from interactive
57f6ec02 853 commands. The values of these variables may be specified as
b4c61ed6
JH
854 in color.branch.<slot>.
855
1d77043b
JH
856color.pager::
857 A boolean to enable/disable colored output when the pager is in
858 use (default is true).
859
ab07ba2a
MH
860color.showbranch::
861 A boolean to enable/disable color in the output of
862 linkgit:git-show-branch[1]. May be set to `always`,
863 `false` (or `never`) or `auto` (or `true`), in which case colors are used
864 only when the output is to a terminal. Defaults to false.
865
1d77043b
JH
866color.status::
867 A boolean to enable/disable color in the output of
5162e697 868 linkgit:git-status[1]. May be set to `always`,
cec99d8c 869 `false` (or `never`) or `auto` (or `true`), in which case colors are used
1d77043b
JH
870 only when the output is to a terminal. Defaults to false.
871
872color.status.<slot>::
873 Use customized color for status colorization. `<slot>` is
874 one of `header` (the header text of the status message),
82dca848
SP
875 `added` or `updated` (files which are added but not committed),
876 `changed` (files which are changed but not added in the index),
1d282327
AA
877 `untracked` (files which are not tracked by git),
878 `branch` (the current branch), or
950ce2e2
CP
879 `nobranch` (the color the 'no branch' warning is shown in, defaulting
880 to red). The values of these variables may be specified as in
881 color.branch.<slot>.
1d77043b 882
6b2f2d98 883color.ui::
6999c540
MG
884 This variable determines the default value for variables such
885 as `color.diff` and `color.grep` that control the use of color
886 per command family. Its scope will expand as more commands learn
887 configuration to set a default for the `--color` option. Set it
888 to `always` if you want all output not intended for machine
889 consumption to use color, to `true` or `auto` if you want such
890 output to use color when written to the terminal, or to `false` or
891 `never` if you prefer git commands not to use color unless enabled
892 explicitly with some other configuration or the `--color` option.
6b2f2d98 893
7e29b825
NTND
894column.ui::
895 Specify whether supported commands should output in columns.
896 This variable consists of a list of tokens separated by spaces
897 or commas:
898+
899--
900`always`;;
901 always show in columns
902`never`;;
903 never show in columns
904`auto`;;
905 show in columns if the output is to the terminal
077539d7
NTND
906`column`;;
907 fill columns before rows (default)
908`row`;;
909 fill rows before columns
7e29b825
NTND
910`plain`;;
911 show in one column
3f8eccbe
NTND
912`dense`;;
913 make unequal size columns to utilize more space
914`nodense`;;
915 make equal size columns
7e29b825
NTND
916--
917+
b1290514 918This option defaults to 'never'.
7e29b825 919
ebe31ef2
NTND
920column.branch::
921 Specify whether to output branch listing in `git branch` in columns.
922 See `column.ui` for details.
923
323d0530
NTND
924column.status::
925 Specify whether to output untracked files in `git status` in columns.
926 See `column.ui` for details.
927
d96e3c15
NTND
928column.tag::
929 Specify whether to output tag listing in `git tag` in columns.
930 See `column.ui` for details.
931
88955ed2 932commit.status::
bed575e4
JHI
933 A boolean to enable/disable inclusion of status information in the
934 commit message template when using an editor to prepare the commit
935 message. Defaults to true.
936
b0f34c3d
MM
937commit.template::
938 Specify a file to use as the template for new commit messages.
6cf378f0 939 "`~/`" is expanded to the value of `$HOME` and "`~user/`" to the
df2a79f4 940 specified user's home directory.
b0f34c3d 941
a6fc9fd3
JK
942credential.helper::
943 Specify an external helper to be called when a username or
944 password credential is needed; the helper may consult external
945 storage to avoid prompting the user for the credentials. See
946 linkgit:gitcredentials[7] for details.
947
948credential.useHttpPath::
949 When acquiring credentials, consider the "path" component of an http
950 or https URL to be important. Defaults to false. See
951 linkgit:gitcredentials[7] for more information.
952
953credential.username::
954 If no username is set for a network authentication, use this username
955 by default. See credential.<context>.* below, and
956 linkgit:gitcredentials[7].
957
958credential.<url>.*::
959 Any of the credential.* options above can be applied selectively to
960 some credentials. For example "credential.https://example.com.username"
961 would set the default username only for https connections to
962 example.com. See linkgit:gitcredentials[7] for details on how URLs are
963 matched.
964
19299a84 965include::diff-config.txt[]
afcbc8e7
DA
966
967difftool.<tool>.path::
968 Override the path for the given tool. This is useful in case
969 your tool is not in the PATH.
970
971difftool.<tool>.cmd::
972 Specify the command to invoke the specified diff tool.
973 The specified command is evaluated in shell with the following
974 variables available: 'LOCAL' is set to the name of the temporary
975 file containing the contents of the diff pre-image and 'REMOTE'
976 is set to the name of the temporary file containing the contents
977 of the diff post-image.
978
a904392e
DA
979difftool.prompt::
980 Prompt before each invocation of the diff tool.
981
be254a0e 982fetch.recurseSubmodules::
1fb25502
JL
983 This option can be either set to a boolean value or to 'on-demand'.
984 Setting it to a boolean changes the behavior of fetch and pull to
985 unconditionally recurse into submodules when set to true or to not
986 recurse at all when set to false. When set to 'on-demand' (the default
987 value), fetch and pull will only recurse into a populated submodule
988 when its superproject retrieves a commit that updates the submodule's
989 reference.
be254a0e 990
5e838ea7
JH
991fetch.fsckObjects::
992 If it is set to true, git-fetch-pack will check all fetched
993 objects. It will abort in the case of a malformed object or a
994 broken link. The result of an abort are only dangling objects.
dab76d3a
JH
995 Defaults to false. If not set, the value of `transfer.fsckObjects`
996 is used instead.
5e838ea7 997
af7cf268
JH
998fetch.unpackLimit::
999 If the number of objects fetched over the git native
1000 transfer is below this
1001 limit, then the objects will be unpacked into loose object
1002 files. However if the number of received objects equals or
1003 exceeds this limit then the received pack will be stored as
1004 a pack, after adding any missing delta bases. Storing the
1005 pack from a push can make the push operation complete faster,
80cd9cf9
MB
1006 especially on slow filesystems. If not set, the value of
1007 `transfer.unpackLimit` is used instead.
af7cf268 1008
48d3448d
SB
1009format.attach::
1010 Enable multipart/mixed attachments as the default for
1011 'format-patch'. The value can also be a double quoted string
1012 which will enable attachments as the default and set the
1013 value as the boundary. See the --attach option in
1014 linkgit:git-format-patch[1].
1015
49604a4d 1016format.numbered::
a567fdcb
BG
1017 A boolean which can enable or disable sequence numbers in patch
1018 subjects. It defaults to "auto" which enables it only if there
1019 is more than one patch. It can be enabled or disabled for all
1020 messages by setting it to "true" or "false". See --numbered
1021 option in linkgit:git-format-patch[1].
49604a4d 1022
1ab661dd
PB
1023format.headers::
1024 Additional email headers to include in a patch to be submitted
5162e697 1025 by mail. See linkgit:git-format-patch[1].
1ab661dd 1026
312a30eb 1027format.to::
48d3448d 1028format.cc::
312a30eb
MV
1029 Additional recipients to include in a patch to be submitted
1030 by mail. See the --to and --cc options in
1031 linkgit:git-format-patch[1].
48d3448d
SB
1032
1033format.subjectprefix::
1034 The default for format-patch is to output files with the '[PATCH]'
1035 subject prefix. Use this variable to change that prefix.
1036
6622d9c7
SB
1037format.signature::
1038 The default for format-patch is to output a signature containing
1039 the git version number. Use this variable to change that default.
1040 Set this variable to the empty string ("") to suppress
1041 signature generation.
1042
78cb59c8
JS
1043format.suffix::
1044 The default for format-patch is to output files with the suffix
1045 `.patch`. Use this variable to change that suffix (make sure to
1046 include the dot if you want it).
1ab661dd 1047
94c22a5e
CR
1048format.pretty::
1049 The default pretty format for log/show/whatchanged command,
1050 See linkgit:git-log[1], linkgit:git-show[1],
1051 linkgit:git-whatchanged[1].
1052
30984ed2 1053format.thread::
0b444cdb 1054 The default threading style for 'git format-patch'. Can be
578b62bf
JN
1055 a boolean value, or `shallow` or `deep`. `shallow` threading
1056 makes every mail a reply to the head of the series,
30984ed2 1057 where the head is chosen from the cover letter, the
6cf378f0 1058 `--in-reply-to`, and the first patch mail, in this order.
fd1ff306 1059 `deep` threading makes every mail a reply to the previous one.
30984ed2
TR
1060 A true boolean value is the same as `shallow`, and a false
1061 value disables threading.
1062
1d1876e9
HV
1063format.signoff::
1064 A boolean value which lets you enable the `-s/--signoff` option of
1065 format-patch by default. *Note:* Adding the Signed-off-by: line to a
1066 patch should be a conscious act and means that you certify you have
1067 the rights to submit this work under the same open source license.
1068 Please see the 'SubmittingPatches' document for further discussion.
1069
26488f59
RR
1070filter.<driver>.clean::
1071 The command which is used to convert the content of a worktree
1072 file to a blob upon checkin. See linkgit:gitattributes[5] for
1073 details.
1074
1075filter.<driver>.smudge::
1076 The command which is used to convert the content of a blob
1077 object to a worktree file upon checkout. See
1078 linkgit:gitattributes[5] for details.
1079
0d7566a5
TT
1080gc.aggressiveWindow::
1081 The window size parameter used in the delta compression
0b444cdb 1082 algorithm used by 'git gc --aggressive'. This defaults
f78683f3 1083 to 250.
0d7566a5 1084
e9831e83
JH
1085gc.auto::
1086 When there are approximately more than this many loose
1087 objects in the repository, `git gc --auto` will pack them.
1088 Some Porcelain commands use this command to perform a
80cd9cf9
MB
1089 light-weight garbage collection from time to time. The
1090 default value is 6700. Setting this to 0 disables it.
e9831e83 1091
17815501
JH
1092gc.autopacklimit::
1093 When there are more than this many packs that are not
1094 marked with `*.keep` file in the repository, `git gc
80cd9cf9 1095 --auto` consolidates them into one larger pack. The
97063974 1096 default value is 50. Setting this to 0 disables it.
17815501 1097
c2120e5e 1098gc.packrefs::
efc266e8
JN
1099 Running `git pack-refs` in a repository renders it
1100 unclonable by Git versions prior to 1.5.1.2 over dumb
1101 transports such as HTTP. This variable determines whether
4be0c352 1102 'git gc' runs `git pack-refs`. This can be set to `notbare`
efc266e8
JN
1103 to enable it within all non-bare repos or it can be set to a
1104 boolean value. The default is `true`.
c2120e5e 1105
25ee9731 1106gc.pruneexpire::
0b444cdb 1107 When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
8e8daf33
NP
1108 Override the grace period with this config variable. The value
1109 "now" may be used to disable this grace period and always prune
1110 unreachable objects immediately.
25ee9731 1111
4aec56d1 1112gc.reflogexpire::
eb523a8d 1113gc.<pattern>.reflogexpire::
0b444cdb 1114 'git reflog expire' removes reflog entries older than
eb523a8d
JH
1115 this time; defaults to 90 days. With "<pattern>" (e.g.
1116 "refs/stash") in the middle the setting applies only to
1117 the refs that match the <pattern>.
4aec56d1
JH
1118
1119gc.reflogexpireunreachable::
eb523a8d 1120gc.<ref>.reflogexpireunreachable::
0b444cdb 1121 'git reflog expire' removes reflog entries older than
4aec56d1 1122 this time and are not reachable from the current tip;
eb523a8d
JH
1123 defaults to 30 days. With "<pattern>" (e.g. "refs/stash")
1124 in the middle, the setting applies only to the refs that
1125 match the <pattern>.
4aec56d1 1126
48c32424
JH
1127gc.rerereresolved::
1128 Records of conflicted merge you resolved earlier are
0b444cdb 1129 kept for this many days when 'git rerere gc' is run.
5162e697 1130 The default is 60 days. See linkgit:git-rerere[1].
48c32424
JH
1131
1132gc.rerereunresolved::
1133 Records of conflicted merge you have not resolved are
0b444cdb 1134 kept for this many days when 'git rerere gc' is run.
5162e697 1135 The default is 15 days. See linkgit:git-rerere[1].
48c32424 1136
280514e1
FE
1137gitcvs.commitmsgannotation::
1138 Append this string to each commit message. Set to empty string
1139 to disable this feature. Defaults to "via git-CVS emulator".
1140
1ab661dd 1141gitcvs.enabled::
db218723 1142 Whether the CVS server interface is enabled for this repository.
5162e697 1143 See linkgit:git-cvsserver[1].
1ab661dd
PB
1144
1145gitcvs.logfile::
db218723 1146 Path to a log file where the CVS server interface well... logs
5162e697 1147 various stuff. See linkgit:git-cvsserver[1].
1ab661dd 1148
1707adb7 1149gitcvs.usecrlfattr::
5ec3e670
EB
1150 If true, the server will look up the end-of-line conversion
1151 attributes for files to determine the '-k' modes to use. If
1152 the attributes force git to treat a file as text,
6b677a28 1153 the '-k' mode will be left blank so CVS clients will
5ec3e670 1154 treat it as text. If they suppress text conversion, the file
1168d402 1155 will be set with '-kb' mode, which suppresses any newline munging
5ec3e670
EB
1156 the client might otherwise do. If the attributes do not allow
1157 the file type to be determined, then 'gitcvs.allbinary' is
1158 used. See linkgit:gitattributes[5].
8a06a632 1159
eabb0bfd 1160gitcvs.allbinary::
90948a42
MO
1161 This is used if 'gitcvs.usecrlfattr' does not resolve
1162 the correct '-kb' mode to use. If true, all
1163 unresolved files are sent to the client in
1164 mode '-kb'. This causes the client to treat them
1165 as binary files, which suppresses any newline munging it
1166 otherwise might do. Alternatively, if it is set to "guess",
1167 then the contents of the file are examined to decide if
1168 it is binary, similar to 'core.autocrlf'.
abbf5947 1169
04752868
FL
1170gitcvs.dbname::
1171 Database used by git-cvsserver to cache revision information
1172 derived from the git repository. The exact meaning depends on the
1173 used database driver, for SQLite (which is the default driver) this
1174 is a filename. Supports variable substitution (see
5162e697 1175 linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).
04752868
FL
1176 Default: '%Ggitcvs.%m.sqlite'
1177
1178gitcvs.dbdriver::
1179 Used Perl DBI driver. You can specify any available driver
1180 for this here, but it might not work. git-cvsserver is tested
1181 with 'DBD::SQLite', reported to work with 'DBD::Pg', and
1182 reported *not* to work with 'DBD::mysql'. Experimental feature.
1183 May not contain double colons (`:`). Default: 'SQLite'.
5162e697 1184 See linkgit:git-cvsserver[1].
eabb0bfd 1185
04752868
FL
1186gitcvs.dbuser, gitcvs.dbpass::
1187 Database user and password. Only useful if setting 'gitcvs.dbdriver',
1188 since SQLite has no concept of database users and/or passwords.
1189 'gitcvs.dbuser' supports variable substitution (see
5162e697 1190 linkgit:git-cvsserver[1] for details).
04752868 1191
6aeeffd1
JE
1192gitcvs.dbTableNamePrefix::
1193 Database table name prefix. Prepended to the names of any
1194 database tables used, allowing a single database to be used
1195 for several repositories. Supports variable substitution (see
1196 linkgit:git-cvsserver[1] for details). Any non-alphabetic
1197 characters will be replaced with underscores.
1198
8a06a632
MO
1199All gitcvs variables except for 'gitcvs.usecrlfattr' and
1200'gitcvs.allbinary' can also be specified as
1201'gitcvs.<access_method>.<varname>' (where 'access_method'
02783075
BH
1202is one of "ext" and "pserver") to make them apply only for the given
1203access method.
04752868 1204
cd82323f
JN
1205gitweb.category::
1206gitweb.description::
1207gitweb.owner::
1208gitweb.url::
1209 See linkgit:gitweb[1] for description.
1210
1211gitweb.avatar::
1212gitweb.blame::
1213gitweb.grep::
1214gitweb.highlight::
1215gitweb.patches::
1216gitweb.pickaxe::
1217gitweb.remote_heads::
1218gitweb.showsizes::
1219gitweb.snapshot::
1220 See linkgit:gitweb.conf[5] for description.
1221
b22520a3
JR
1222grep.lineNumber::
1223 If set to true, enable '-n' option by default.
1224
84befcd0
S
1225grep.patternType::
1226 Set the default matching behavior. Using a value of 'basic', 'extended',
1227 'fixed', or 'perl' will enable the '--basic-regexp', '--extended-regexp',
1228 '--fixed-strings', or '--perl-regexp' option accordingly, while the
1229 value 'default' will return to the default matching behavior.
1230
b22520a3 1231grep.extendedRegexp::
84befcd0
S
1232 If set to true, enable '--extended-regexp' option by default. This
1233 option is ignored when the 'grep.patternType' option is set to a value
1234 other than 'default'.
b22520a3 1235
0c5e70f0
JH
1236gpg.program::
1237 Use this custom program instead of "gpg" found on $PATH when
1238 making or verifying a PGP signature. The program must support the
1239 same command line interface as GPG, namely, to verify a detached
1240 signature, "gpg --verify $file - <$signature" is run, and the
1241 program is expected to signal a good signature by exiting with
1242 code 0, and to generate an ascii-armored detached signature, the
1243 standard input of "gpg -bsau $key" is fed with the contents to be
1244 signed, and the program is expected to send the result to its
1245 standard output.
1246
d84ae0db
GH
1247gui.commitmsgwidth::
1248 Defines how wide the commit message window is in the
1249 linkgit:git-gui[1]. "75" is the default.
1250
1251gui.diffcontext::
1252 Specifies how many context lines should be used in calls to diff
1253 made by the linkgit:git-gui[1]. The default is "5".
1254
a2df1fb2
AG
1255gui.encoding::
1256 Specifies the default encoding to use for displaying of
1257 file contents in linkgit:git-gui[1] and linkgit:gitk[1].
1258 It can be overridden by setting the 'encoding' attribute
1259 for relevant files (see linkgit:gitattributes[5]).
1260 If this option is not set, the tools default to the
1261 locale encoding.
1262
d84ae0db
GH
1263gui.matchtrackingbranch::
1264 Determines if new branches created with linkgit:git-gui[1] should
1265 default to tracking remote branches with matching names or
1266 not. Default: "false".
1267
1268gui.newbranchtemplate::
1269 Is used as suggested name when creating new branches using the
1270 linkgit:git-gui[1].
1271
1272gui.pruneduringfetch::
8b3f3f84 1273 "true" if linkgit:git-gui[1] should prune remote-tracking branches when
d84ae0db
GH
1274 performing a fetch. The default value is "false".
1275
1276gui.trustmtime::
1277 Determines if linkgit:git-gui[1] should trust the file modification
1278 timestamp or not. By default the timestamps are not trusted.
1279
1280gui.spellingdictionary::
1281 Specifies the dictionary used for spell checking commit messages in
1282 the linkgit:git-gui[1]. When set to "none" spell checking is turned
1283 off.
1284
a2df1fb2 1285gui.fastcopyblame::
ca768288 1286 If true, 'git gui blame' uses `-C` instead of `-C -C` for original
a2df1fb2
AG
1287 location detection. It makes blame significantly faster on huge
1288 repositories at the expense of less thorough copy detection.
1289
1290gui.copyblamethreshold::
76bac890 1291 Specifies the threshold to use in 'git gui blame' original location
a2df1fb2
AG
1292 detection, measured in alphanumeric characters. See the
1293 linkgit:git-blame[1] manual for more information on copy detection.
1294
1295gui.blamehistoryctx::
1296 Specifies the radius of history context in days to show in
1297 linkgit:gitk[1] for the selected commit, when the `Show History
1298 Context` menu item is invoked from 'git gui blame'. If this
1299 variable is set to zero, the whole history is shown.
1300
390c3480
AG
1301guitool.<name>.cmd::
1302 Specifies the shell command line to execute when the corresponding item
1303 of the linkgit:git-gui[1] `Tools` menu is invoked. This option is
1304 mandatory for every tool. The command is executed from the root of
1305 the working directory, and in the environment it receives the name of
1306 the tool as 'GIT_GUITOOL', the name of the currently selected file as
1307 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if
1308 the head is detached, 'CUR_BRANCH' is empty).
1309
1310guitool.<name>.needsfile::
1311 Run the tool only if a diff is selected in the GUI. It guarantees
1312 that 'FILENAME' is not empty.
1313
1314guitool.<name>.noconsole::
1315 Run the command silently, without creating a window to display its
1316 output.
1317
1318guitool.<name>.norescan::
1319 Don't rescan the working directory for changes after the tool
1320 finishes execution.
1321
1322guitool.<name>.confirm::
1323 Show a confirmation dialog before actually running the tool.
1324
1325guitool.<name>.argprompt::
1326 Request a string argument from the user, and pass it to the tool
1327 through the 'ARGS' environment variable. Since requesting an
1328 argument implies confirmation, the 'confirm' option has no effect
1329 if this is enabled. If the option is set to 'true', 'yes', or '1',
1330 the dialog uses a built-in generic prompt; otherwise the exact
1331 value of the variable is used.
1332
1333guitool.<name>.revprompt::
1334 Request a single valid revision from the user, and set the
1335 'REVISION' environment variable. In other aspects this option
1336 is similar to 'argprompt', and can be used together with it.
1337
1338guitool.<name>.revunmerged::
1339 Show only unmerged branches in the 'revprompt' subdialog.
1340 This is useful for tools similar to merge or rebase, but not
1341 for things like checkout or reset.
1342
1343guitool.<name>.title::
1344 Specifies the title to use for the prompt dialog. The default
1345 is the tool name.
1346
1347guitool.<name>.prompt::
1348 Specifies the general prompt string to display at the top of
1349 the dialog, before subsections for 'argprompt' and 'revprompt'.
1350 The default value includes the actual command.
1351
983a9eeb
CC
1352help.browser::
1353 Specify the browser that will be used to display help in the
1354 'web' format. See linkgit:git-help[1].
1355
1356help.format::
1357 Override the default help format used by linkgit:git-help[1].
1358 Values 'man', 'info', 'web' and 'html' are supported. 'man' is
1359 the default. 'web' and 'html' are the same.
1360
f0e90716
AR
1361help.autocorrect::
1362 Automatically correct and execute mistyped commands after
1363 waiting for the given number of deciseconds (0.1 sec). If more
1364 than one command can be deduced from the entered text, nothing
1365 will be executed. If the value of this option is negative,
1366 the corrected command will be executed immediately. If the
1367 value is 0 - the command will be just shown but not executed.
1368 This is the default.
1369
9c5665aa 1370http.proxy::
b2c8c6d9
CB
1371 Override the HTTP proxy, normally configured using the 'http_proxy',
1372 'https_proxy', and 'all_proxy' environment variables (see
1373 `curl(1)`). This can be overridden on a per-remote basis; see
1374 remote.<name>.proxy
9c5665aa 1375
bcfb95dd
DB
1376http.cookiefile::
1377 File containing previously stored cookie lines which should be used
1378 in the git http session, if they match the server. The file format
1379 of the file to read cookies from should be plain HTTP headers or
1380 the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
1381 NOTE that the file specified with http.cookiefile is only used as
1382 input. No cookies will be stored in the file.
1383
1ab661dd
PB
1384http.sslVerify::
1385 Whether to verify the SSL certificate when fetching or pushing
37425065 1386 over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
1ab661dd
PB
1387 variable.
1388
1389http.sslCert::
1390 File containing the SSL certificate when fetching or pushing
37425065 1391 over HTTPS. Can be overridden by the 'GIT_SSL_CERT' environment
1ab661dd
PB
1392 variable.
1393
1394http.sslKey::
1395 File containing the SSL private key when fetching or pushing
abda1ef5 1396 over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment
1ab661dd
PB
1397 variable.
1398
754ae192
ML
1399http.sslCertPasswordProtected::
1400 Enable git's password prompt for the SSL certificate. Otherwise
1401 OpenSSL will prompt the user, possibly many times, if the
1402 certificate or private key is encrypted. Can be overridden by the
1403 'GIT_SSL_CERT_PASSWORD_PROTECTED' environment variable.
1404
1ab661dd
PB
1405http.sslCAInfo::
1406 File containing the certificates to verify the peer with when
abda1ef5 1407 fetching or pushing over HTTPS. Can be overridden by the
1ab661dd
PB
1408 'GIT_SSL_CAINFO' environment variable.
1409
1410http.sslCAPath::
1411 Path containing files with the CA certificates to verify the peer
37425065 1412 with when fetching or pushing over HTTPS. Can be overridden
1ab661dd
PB
1413 by the 'GIT_SSL_CAPATH' environment variable.
1414
1415http.maxRequests::
abda1ef5 1416 How many HTTP requests to launch in parallel. Can be overridden
1ab661dd
PB
1417 by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
1418
ad75ebe5
TRC
1419http.minSessions::
1420 The number of curl sessions (counted across slots) to be kept across
1421 requests. They will not be ended with curl_easy_cleanup() until
1422 http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this
1423 value will be capped at 1. Defaults to 1.
1424
de1a2fdd
SP
1425http.postBuffer::
1426 Maximum size in bytes of the buffer used by smart HTTP
1427 transports when POSTing data to the remote system.
1428 For requests larger than this buffer size, HTTP/1.1 and
1429 Transfer-Encoding: chunked is used to avoid creating a
1430 massive pack file locally. Default is 1 MiB, which is
1431 sufficient for most requests.
1432
1ab661dd
PB
1433http.lowSpeedLimit, http.lowSpeedTime::
1434 If the HTTP transfer speed is less than 'http.lowSpeedLimit'
1435 for longer than 'http.lowSpeedTime' seconds, the transfer is aborted.
abda1ef5 1436 Can be overridden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and
1ab661dd
PB
1437 'GIT_HTTP_LOW_SPEED_TIME' environment variables.
1438
3ea099d4
SK
1439http.noEPSV::
1440 A boolean which disables using of EPSV ftp command by curl.
befc9c42 1441 This can helpful with some "poor" ftp servers which don't
3ea099d4
SK
1442 support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'
1443 environment variable. Default is false (curl will use EPSV).
1444
b1d1058c
SO
1445http.useragent::
1446 The HTTP USER_AGENT string presented to an HTTP server. The default
1447 value represents the version of the client git such as git/1.7.1.
1448 This option allows you to override this value to a more common value
1449 such as Mozilla/4.0. This may be necessary, for instance, if
1450 connecting through a firewall that restricts HTTP connections to a set
1451 of common USER_AGENT strings (but not including those like git/1.7.1).
1452 Can be overridden by the 'GIT_HTTP_USER_AGENT' environment variable.
1453
1ab661dd
PB
1454i18n.commitEncoding::
1455 Character encoding the commit messages are stored in; git itself
1456 does not care per se, but this information is necessary e.g. when
1457 importing commits from emails or in the gitk graphical history
1458 browser (and possibly at other places in the future or in other
5162e697 1459 porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
1ab661dd 1460
d2c11a38
JH
1461i18n.logOutputEncoding::
1462 Character encoding the commit messages are converted to when
0b444cdb 1463 running 'git log' and friends.
d2c11a38 1464
b0f34c3d
MM
1465imap::
1466 The configuration variables in the 'imap' section are described
1467 in linkgit:git-imap-send[1].
1468
d8a8488d
SD
1469init.templatedir::
1470 Specify the directory from which templates will be copied.
1471 (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
1472
983a9eeb
CC
1473instaweb.browser::
1474 Specify the program that will be used to browse your working
1475 repository in gitweb. See linkgit:git-instaweb[1].
1476
1477instaweb.httpd::
1478 The HTTP daemon command-line to start gitweb on your working
1479 repository. See linkgit:git-instaweb[1].
1480
1481instaweb.local::
1482 If true the web server started by linkgit:git-instaweb[1] will
1483 be bound to the local IP (127.0.0.1).
1484
1485instaweb.modulepath::
6b677a28
VS
1486 The default module path for linkgit:git-instaweb[1] to use
1487 instead of /usr/lib/apache2/modules. Only used if httpd
1488 is Apache.
983a9eeb
CC
1489
1490instaweb.port::
1491 The port number to bind the gitweb httpd to. See
1492 linkgit:git-instaweb[1].
1493
ca6ac7f1 1494interactive.singlekey::
57f6ec02 1495 In interactive commands, allow the user to provide one-letter
ca6ac7f1 1496 input with a single key (i.e., without hitting enter).
6cf378f0 1497 Currently this is used by the `--patch` mode of
e6b57a8a
CI
1498 linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1],
1499 linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this
1500 setting is silently ignored if portable keystroke input
1501 is not available.
ca6ac7f1 1502
0c47695a
JS
1503log.abbrevCommit::
1504 If true, makes linkgit:git-log[1], linkgit:git-show[1], and
6cf378f0
JK
1505 linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may
1506 override this option with `--no-abbrev-commit`.
0c47695a 1507
dd0ffd5b 1508log.date::
e860795d
JN
1509 Set the default date-time mode for the 'log' command.
1510 Setting a value for log.date is similar to using 'git log''s
6cf378f0 1511 `--date` option. Possible values are `relative`, `local`,
e860795d
JN
1512 `default`, `iso`, `rfc`, and `short`; see linkgit:git-log[1]
1513 for details.
dd0ffd5b 1514
eb734454
SD
1515log.decorate::
1516 Print out the ref names of any commits that are shown by the log
1517 command. If 'short' is specified, the ref name prefixes 'refs/heads/',
1518 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
1519 specified, the full ref name (including prefix) will be printed.
1520 This is the same as the log commands '--decorate' option.
1521
0f03ca94
PB
1522log.showroot::
1523 If true, the initial commit will be shown as a big creation event.
1524 This is equivalent to a diff against an empty tree.
5162e697 1525 Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
0f03ca94
PB
1526 normally hide the root commit will now show it. True by default.
1527
d551a488
MSO
1528mailmap.file::
1529 The location of an augmenting mailmap file. The default
1530 mailmap, located in the root of the repository, is loaded
1531 first, then the mailmap file pointed to by this variable.
1532 The location of the mailmap file may be in a repository
1533 subdirectory, or somewhere outside of the repository itself.
1534 See linkgit:git-shortlog[1] and linkgit:git-blame[1].
1535
08610900
JK
1536mailmap.blob::
1537 Like `mailmap.file`, but consider the value as a reference to a
8c473cec
JK
1538 blob in the repository. If both `mailmap.file` and
1539 `mailmap.blob` are given, both are parsed, with entries from
1540 `mailmap.file` taking precedence. In a bare repository, this
1541 defaults to `HEAD:.mailmap`. In a non-bare repository, it
1542 defaults to empty.
08610900 1543
b5578f33 1544man.viewer::
b8322ea8 1545 Specify the programs that may be used to display help in the
b5578f33
CC
1546 'man' format. See linkgit:git-help[1].
1547
0bb64009
CC
1548man.<tool>.cmd::
1549 Specify the command to invoke the specified man viewer. The
1550 specified command is evaluated in shell with the man page
1551 passed as argument. (See linkgit:git-help[1].)
1552
7e8114c0
CC
1553man.<tool>.path::
1554 Override the path for the given tool that may be used to
1555 display help in the 'man' format. See linkgit:git-help[1].
1556
b0f34c3d 1557include::merge-config.txt[]
b5412484 1558
77680caa
JS
1559mergetool.<tool>.path::
1560 Override the path for the given tool. This is useful in case
1561 your tool is not in the PATH.
1562
964473a0
CB
1563mergetool.<tool>.cmd::
1564 Specify the command to invoke the specified merge tool. The
1565 specified command is evaluated in shell with the following
1566 variables available: 'BASE' is the name of a temporary file
1567 containing the common base of the files to be merged, if available;
1568 'LOCAL' is the name of a temporary file containing the contents of
1569 the file on the current branch; 'REMOTE' is the name of a temporary
1570 file containing the contents of the file from the branch being
1571 merged; 'MERGED' contains the name of the file to which the merge
1572 tool should write the results of a successful merge.
1573
1574mergetool.<tool>.trustExitCode::
1575 For a custom merge command, specify whether the exit code of
1576 the merge command can be used to determine whether the merge was
1577 successful. If this is not set to true then the merge target file
1578 timestamp is checked and the merge assumed to have been successful
1579 if the file has been updated, otherwise the user is prompted to
1580 indicate the success of the merge.
1581
44c36d1c
CB
1582mergetool.keepBackup::
1583 After performing a merge, the original file with conflict markers
1584 can be saved as a file with a `.orig` extension. If this variable
1585 is set to `false` then this file is not preserved. Defaults to
1586 `true` (i.e. keep the backup files).
1587
162eba8b
CB
1588mergetool.keepTemporaries::
1589 When invoking a custom merge tool, git uses a set of temporary
1590 files to pass to the tool. If the tool returns an error and this
1591 variable is set to `true`, then these temporary files will be
1592 preserved, otherwise they will be removed after the tool has
1593 exited. Defaults to `false`.
1594
682b451f
CB
1595mergetool.prompt::
1596 Prompt before each invocation of the merge resolution program.
1597
894a9d33
TR
1598notes.displayRef::
1599 The (fully qualified) refname from which to show notes when
1600 showing commit messages. The value of this variable can be set
1601 to a glob, in which case notes from all matching refs will be
1602 shown. You may also specify this configuration variable
1603 several times. A warning will be issued for refs that do not
1604 exist, but a glob that does not match any refs is silently
1605 ignored.
1606+
1607This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
1608environment variable, which must be a colon separated list of refs or
1609globs.
1610+
1611The effective value of "core.notesRef" (possibly overridden by
1612GIT_NOTES_REF) is also implicitly added to the list of refs to be
1613displayed.
1614
6956f858
TR
1615notes.rewrite.<command>::
1616 When rewriting commits with <command> (currently `amend` or
1617 `rebase`) and this variable is set to `true`, git
1618 automatically copies your notes from the original to the
1619 rewritten commit. Defaults to `true`, but see
1620 "notes.rewriteRef" below.
6956f858
TR
1621
1622notes.rewriteMode::
1623 When copying notes during a rewrite (see the
1624 "notes.rewrite.<command>" option), determines what to do if
1625 the target commit already has a note. Must be one of
1626 `overwrite`, `concatenate`, or `ignore`. Defaults to
1627 `concatenate`.
1628+
1629This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
1630environment variable.
1631
1632notes.rewriteRef::
1633 When copying notes during a rewrite, specifies the (fully
1634 qualified) ref whose notes should be copied. The ref may be a
1635 glob, in which case notes in all matching refs will be copied.
1636 You may also specify this configuration several times.
1637+
1638Does not have a default value; you must configure this variable to
2b4aa89c
TR
1639enable note rewriting. Set it to `refs/notes/commits` to enable
1640rewriting for the default commit notes.
cfb88e9a
LAS
1641+
1642This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
1643environment variable, which must be a colon separated list of refs or
1644globs.
6956f858 1645
4812a93a 1646pack.window::
5162e697 1647 The size of the window used by linkgit:git-pack-objects[1] when no
4812a93a
JK
1648 window size is given on the command line. Defaults to 10.
1649
842aaf93 1650pack.depth::
5162e697 1651 The maximum delta depth used by linkgit:git-pack-objects[1] when no
618e613a 1652 maximum depth is given on the command line. Defaults to 50.
842aaf93 1653
e93b15cd 1654pack.windowMemory::
5162e697 1655 The window memory size limit used by linkgit:git-pack-objects[1]
e93b15cd
BD
1656 when no limit is given on the command line. The value can be
1657 suffixed with "k", "m", or "g". Defaults to 0, meaning no
1658 limit.
1659
960ccca6
DH
1660pack.compression::
1661 An integer -1..9, indicating the compression level for objects
1662 in a pack file. -1 is the zlib default. 0 means no
1663 compression, and 1..9 are various speed/size tradeoffs, 9 being
1664 slowest. If not set, defaults to core.compression. If that is
dec92309
BD
1665 not set, defaults to -1, the zlib default, which is "a default
1666 compromise between speed and compression (currently equivalent
1667 to level 6)."
89d71f75
JK
1668+
1669Note that changing the compression level will not automatically recompress
1670all existing objects. You can force recompression by passing the -F option
1671to linkgit:git-repack[1].
960ccca6 1672
074b2eea 1673pack.deltaCacheSize::
02783075 1674 The maximum memory in bytes used for caching deltas in
5749b0b2
NP
1675 linkgit:git-pack-objects[1] before writing them out to a pack.
1676 This cache is used to speed up the writing object phase by not
1677 having to recompute the final delta result once the best match
1678 for all objects is found. Repacking large repositories on machines
1679 which are tight with memory might be badly impacted by this though,
1680 especially if this cache pushes the system into swapping.
1681 A value of 0 means no limit. The smallest size of 1 byte may be
1682 used to virtually disable this cache. Defaults to 256 MiB.
074b2eea 1683
e3dfddb3 1684pack.deltaCacheLimit::
693b86ff 1685 The maximum size of a delta, that is cached in
5749b0b2
NP
1686 linkgit:git-pack-objects[1]. This cache is used to speed up the
1687 writing object phase by not having to recompute the final delta
1688 result once the best match for all objects is found. Defaults to 1000.
e3dfddb3 1689
693b86ff
NP
1690pack.threads::
1691 Specifies the number of threads to spawn when searching for best
5162e697 1692 delta matches. This requires that linkgit:git-pack-objects[1]
693b86ff
NP
1693 be compiled with pthreads otherwise this option is ignored with a
1694 warning. This is meant to reduce packing time on multiprocessor
1695 machines. The required amount of memory for the delta search window
1696 is however multiplied by the number of threads.
833e3df1
AE
1697 Specifying 0 will cause git to auto-detect the number of CPU's
1698 and set the number of threads accordingly.
693b86ff 1699
4d00bda2
NP
1700pack.indexVersion::
1701 Specify the default pack index version. Valid values are 1 for
1702 legacy pack index used by Git versions prior to 1.5.2, and 2 for
1703 the new pack index with capabilities for packs larger than 4 GB
1704 as well as proper protection against the repacking of corrupted
c0a5e2d4
NP
1705 packs. Version 2 is the default. Note that version 2 is enforced
1706 and this config option ignored whenever the corresponding pack is
1707 larger than 2 GB.
1708+
6cf378f0 1709If you have an old git that does not understand the version 2 `*.idx` file,
c0a5e2d4 1710cloning or fetching over a non native protocol (e.g. "http" and "rsync")
6cf378f0 1711that will copy both `*.pack` file and corresponding `*.idx` file from the
c0a5e2d4 1712other side may give you a repository that cannot be accessed with your
6cf378f0 1713older version of git. If the `*.pack` file is smaller than 2 GB, however,
c0a5e2d4 1714you can use linkgit:git-index-pack[1] on the *.pack file to regenerate
6cf378f0 1715the `*.idx` file.
4d00bda2 1716
dbdbfec4 1717pack.packSizeLimit::
07cf0f24
NP
1718 The maximum size of a pack. This setting only affects
1719 packing to a file when repacking, i.e. the git:// protocol
6cf378f0 1720 is unaffected. It can be overridden by the `--max-pack-size`
07cf0f24
NP
1721 option of linkgit:git-repack[1]. The minimum size allowed is
1722 limited to 1 MiB. The default is unlimited.
1723 Common unit suffixes of 'k', 'm', or 'g' are
1724 supported.
2b84b5a8 1725
4370c2d6 1726pager.<cmd>::
9bad7233
JK
1727 If the value is boolean, turns on or off pagination of the
1728 output of a particular git subcommand when writing to a tty.
1729 Otherwise, turns on pagination for the subcommand using the
6cf378f0
JK
1730 pager specified by the value of `pager.<cmd>`. If `--paginate`
1731 or `--no-pager` is specified on the command line, it takes
9bad7233
JK
1732 precedence over this option. To disable pagination for all
1733 commands, set `core.pager` or `GIT_PAGER` to `cat`.
4370c2d6 1734
8028184e
WP
1735pretty.<name>::
1736 Alias for a --pretty= format string, as specified in
1737 linkgit:git-log[1]. Any aliases defined here can be used just
1738 as the built-in pretty formats could. For example,
6cf378f0 1739 running `git config pretty.changelog "format:* %H %s"`
8028184e 1740 would cause the invocation `git log --pretty=changelog`
6cf378f0 1741 to be equivalent to running `git log "--pretty=format:* %H %s"`.
8028184e
WP
1742 Note that an alias with the same name as a built-in format
1743 will be silently ignored.
1744
6b37dff1
ÆAB
1745pull.rebase::
1746 When true, rebase branches on top of the fetched branch, instead
1747 of merging the default branch from the default remote when "git
1748 pull" is run. See "branch.<name>.rebase" for setting this on a
1749 per-branch basis.
1750+
1751*NOTE*: this is a possibly dangerous operation; do *not* use
1752it unless you understand the implications (see linkgit:git-rebase[1]
1753for details).
1754
1ab661dd
PB
1755pull.octopus::
1756 The default merge strategy to use when pulling multiple branches
1757 at once.
1758
1759pull.twohead::
1760 The default merge strategy to use when pulling a single branch.
1761
52153747
FAG
1762push.default::
1763 Defines the action git push should take if no refspec is given
1764 on the command line, no refspec is configured in the remote, and
1765 no refspec is implied by any of the options given on the command
01eadafc 1766 line. Possible values are:
52153747 1767+
b1290514 1768--
9373bdc4 1769* `nothing` - do not push anything.
185c0874
MM
1770* `matching` - push all branches having the same name in both ends.
1771 This is for those who prepare all the branches into a publishable
1772 shape and then push them out with a single command. It is not
1773 appropriate for pushing into a repository shared by multiple users,
1774 since locally stalled branches will attempt a non-fast forward push
67804c27
MM
1775 if other users updated the branch.
1776 +
1777 This is currently the default, but Git 2.0 will change the default
1778 to `simple`.
53c40311 1779* `upstream` - push the current branch to its upstream branch.
185c0874
MM
1780 With this, `git push` will update the same remote ref as the one which
1781 is merged by `git pull`, making `push` and `pull` symmetrical.
1782 See "branch.<name>.merge" for how to configure the upstream branch.
f4d80d26
JH
1783* `simple` - like `upstream`, but refuses to push if the upstream
1784 branch's name is different from the local one. This is the safest
1785 option and is well-suited for beginners. It will become the default
1786 in Git 2.0.
9373bdc4 1787* `current` - push the current branch to a branch of the same name.
b1290514
AS
1788--
1789+
1790The `simple`, `current` and `upstream` modes are for those who want to
1791push out a single branch after finishing work, even when the other
1792branches are not yet ready to be pushed out. If you are working with
1793other people to push into the same shared repository, you would want
1794to use one of these.
52153747 1795
a9c3821c
TAV
1796rebase.stat::
1797 Whether to show a diffstat of what changed upstream since the last
1798 rebase. False by default.
1799
dd1e5b31
HV
1800rebase.autosquash::
1801 If set to true enable '--autosquash' option by default.
1802
77e3efbf
JH
1803receive.autogc::
1804 By default, git-receive-pack will run "git-gc --auto" after
1805 receiving data from git-push and updating refs. You can stop
1806 it by setting this variable to false.
1807
b0f34c3d
MM
1808receive.fsckObjects::
1809 If it is set to true, git-receive-pack will check all received
1810 objects. It will abort in the case of a malformed object or a
1811 broken link. The result of an abort are only dangling objects.
dab76d3a
JH
1812 Defaults to false. If not set, the value of `transfer.fsckObjects`
1813 is used instead.
b0f34c3d
MM
1814
1815receive.unpackLimit::
1816 If the number of objects received in a push is below this
1817 limit then the objects will be unpacked into loose object
1818 files. However if the number of received objects equals or
1819 exceeds this limit then the received pack will be stored as
1820 a pack, after adding any missing delta bases. Storing the
1821 pack from a push can make the push operation complete faster,
1822 especially on slow filesystems. If not set, the value of
1823 `transfer.unpackLimit` is used instead.
1824
42fc11c1
JH
1825receive.denyDeletes::
1826 If set to true, git-receive-pack will deny a ref update that deletes
1827 the ref. Use this to prevent such a ref deletion via a push.
1828
662c83ff
TR
1829receive.denyDeleteCurrent::
1830 If set to true, git-receive-pack will deny a ref update that
1831 deletes the currently checked out branch of a non-bare repository.
1832
42fc11c1 1833receive.denyCurrentBranch::
f3838ce1 1834 If set to true or "refuse", git-receive-pack will deny a ref update
42fc11c1
JH
1835 to the currently checked out branch of a non-bare repository.
1836 Such a push is potentially dangerous because it brings the HEAD
1837 out of sync with the index and working tree. If set to "warn",
1838 print a warning of such a push to stderr, but allow the push to
1839 proceed. If set to false or "ignore", allow such pushes with no
7d182f52 1840 message. Defaults to "refuse".
42fc11c1 1841
b0f34c3d
MM
1842receive.denyNonFastForwards::
1843 If set to true, git-receive-pack will deny a ref update which is
a75d7b54 1844 not a fast-forward. Use this to prevent such an update via a push,
b0f34c3d
MM
1845 even if that push is forced. This configuration variable is
1846 set when initializing a shared repository.
1847
77e3efbf
JH
1848receive.updateserverinfo::
1849 If set to true, git-receive-pack will run git-update-server-info
1850 after receiving data from git-push and updating refs.
1851
0cc6d346 1852remote.<name>.url::
5162e697
DM
1853 The URL of a remote repository. See linkgit:git-fetch[1] or
1854 linkgit:git-push[1].
0cc6d346 1855
20346234
MG
1856remote.<name>.pushurl::
1857 The push URL of a remote repository. See linkgit:git-push[1].
1858
14c98218
SV
1859remote.<name>.proxy::
1860 For remotes that require curl (http, https and ftp), the URL to
1861 the proxy to use for that remote. Set to the empty string to
1862 disable proxying for that remote.
1863
0cc6d346 1864remote.<name>.fetch::
5162e697
DM
1865 The default set of "refspec" for linkgit:git-fetch[1]. See
1866 linkgit:git-fetch[1].
0cc6d346
SB
1867
1868remote.<name>.push::
5162e697
DM
1869 The default set of "refspec" for linkgit:git-push[1]. See
1870 linkgit:git-push[1].
0cc6d346 1871
84bb2dfd
PB
1872remote.<name>.mirror::
1873 If true, pushing to this remote will automatically behave
6cf378f0 1874 as if the `--mirror` option was given on the command line.
84bb2dfd 1875
1918278e
TT
1876remote.<name>.skipDefaultUpdate::
1877 If true, this remote will be skipped by default when updating
7cc91a2f
BG
1878 using linkgit:git-fetch[1] or the `update` subcommand of
1879 linkgit:git-remote[1].
1880
1881remote.<name>.skipFetchAll::
1882 If true, this remote will be skipped by default when updating
1883 using linkgit:git-fetch[1] or the `update` subcommand of
1884 linkgit:git-remote[1].
1918278e 1885
060aafc1 1886remote.<name>.receivepack::
5dee29ac 1887 The default program to execute on the remote side when pushing. See
79f43f3d 1888 option \--receive-pack of linkgit:git-push[1].
060aafc1 1889
5dee29ac
UKK
1890remote.<name>.uploadpack::
1891 The default program to execute on the remote side when fetching. See
79f43f3d 1892 option \--upload-pack of linkgit:git-fetch-pack[1].
5dee29ac 1893
047f636d 1894remote.<name>.tagopt::
79f43f3d 1895 Setting this value to \--no-tags disables automatic tag following when
944163a4
ST
1896 fetching from remote <name>. Setting it to \--tags will fetch every
1897 tag from remote <name>, even if they are not reachable from remote
ed368546
DJ
1898 branch heads. Passing these flags directly to linkgit:git-fetch[1] can
1899 override this setting. See options \--tags and \--no-tags of
1900 linkgit:git-fetch[1].
047f636d 1901
c578f51d
DB
1902remote.<name>.vcs::
1903 Setting this to a value <vcs> will cause git to interact with
1904 the remote with the git-remote-<vcs> helper.
1905
1918278e
TT
1906remotes.<group>::
1907 The list of remotes which are fetched by "git remote update
5162e697 1908 <group>". See linkgit:git-remote[1].
1918278e 1909
b6945f57 1910repack.usedeltabaseoffset::
22c79eab
NP
1911 By default, linkgit:git-repack[1] creates packs that use
1912 delta-base offset. If you need to share your repository with
1913 git older than version 1.4.4, either directly or via a dumb
1914 protocol such as http, then you need to set this option to
1915 "false" and repack. Access from old git versions over the
1916 native protocol are unaffected by this option.
b6945f57 1917
b0f34c3d
MM
1918rerere.autoupdate::
1919 When set to true, `git-rerere` updates the index with the
1920 resulting contents after it cleanly resolves conflicts using
1921 previously recorded resolution. Defaults to false.
1922
1923rerere.enabled::
1924 Activate recording of resolved conflicts, so that identical
07b88a00
TR
1925 conflict hunks can be resolved automatically, should they be
1926 encountered again. By default, linkgit:git-rerere[1] is
1927 enabled if there is an `rr-cache` directory under the
b6fb7fed
JH
1928 `$GIT_DIR`, e.g. if "rerere" was previously used in the
1929 repository.
b0f34c3d 1930
65180c66
YD
1931sendemail.identity::
1932 A configuration identity. When given, causes values in the
1933 'sendemail.<identity>' subsection to take precedence over
1934 values in the 'sendemail' section. The default identity is
1935 the value of 'sendemail.identity'.
1936
1937sendemail.smtpencryption::
1938 See linkgit:git-send-email[1] for description. Note that this
1939 setting is not subject to the 'identity' mechanism.
1940
1941sendemail.smtpssl::
1942 Deprecated alias for 'sendemail.smtpencryption = ssl'.
1943
1944sendemail.<identity>.*::
1945 Identity-specific versions of the 'sendemail.*' parameters
1946 found below, taking precedence over those when the this
1947 identity is selected, through command-line or
1948 'sendemail.identity'.
1949
1950sendemail.aliasesfile::
1951sendemail.aliasfiletype::
1952sendemail.bcc::
1953sendemail.cc::
1954sendemail.cccmd::
1955sendemail.chainreplyto::
1956sendemail.confirm::
1957sendemail.envelopesender::
1958sendemail.from::
1959sendemail.multiedit::
1960sendemail.signedoffbycc::
1961sendemail.smtppass::
1962sendemail.suppresscc::
1963sendemail.suppressfrom::
1964sendemail.to::
69cf7bfd 1965sendemail.smtpdomain::
65180c66
YD
1966sendemail.smtpserver::
1967sendemail.smtpserverport::
052fbea2 1968sendemail.smtpserveroption::
65180c66
YD
1969sendemail.smtpuser::
1970sendemail.thread::
1971sendemail.validate::
1972 See linkgit:git-send-email[1] for description.
1973
1974sendemail.signedoffcc::
1975 Deprecated alias for 'sendemail.signedoffbycc'.
1976
1ab661dd 1977showbranch.default::
5162e697
DM
1978 The default set of branches for linkgit:git-show-branch[1].
1979 See linkgit:git-show-branch[1].
1ab661dd 1980
46f721c8 1981status.relativePaths::
5162e697 1982 By default, linkgit:git-status[1] shows paths relative to the
46f721c8
JK
1983 current directory. Setting this variable to `false` shows paths
1984 relative to the repository root (this was the default for git
1985 prior to v1.5.4).
1986
d6293d1f
MSO
1987status.showUntrackedFiles::
1988 By default, linkgit:git-status[1] and linkgit:git-commit[1] show
1989 files which are not currently tracked by Git. Directories which
1990 contain only untracked files, are shown with the directory name
1991 only. Showing untracked files means that Git needs to lstat() all
1992 all the files in the whole repository, which might be slow on some
1993 systems. So, this variable controls how the commands displays
1994 the untracked files. Possible values are:
1995+
1996--
9373bdc4
CF
1997* `no` - Show no untracked files.
1998* `normal` - Show untracked files and directories.
1999* `all` - Show also individual files in untracked directories.
d6293d1f
MSO
2000--
2001+
2002If this variable is not specified, it defaults to 'normal'.
2003This variable can be overridden with the -u|--untracked-files option
2004of linkgit:git-status[1] and linkgit:git-commit[1].
2005
4b2343fa
MG
2006status.submodulesummary::
2007 Defaults to false.
2008 If this is set to a non zero number or true (identical to -1 or an
2009 unlimited number), the submodule summary will be enabled and a
2010 summary of commits for modified submodules will be shown (see
2011 --summary-limit option of linkgit:git-submodule[1]).
2012
0ad0a61f
JN
2013submodule.<name>.path::
2014submodule.<name>.url::
2015submodule.<name>.update::
2016 The path within this project, URL, and the updating strategy
2017 for a submodule. These variables are initially populated
2018 by 'git submodule init'; edit them to override the
2019 URL and other values found in the `.gitmodules` file. See
2020 linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
2021
06b1abb5
TK
2022submodule.<name>.branch::
2023 The remote branch name for a submodule, used by `git submodule
2024 update --remote`. Set this option to override the value found in
2025 the `.gitmodules` file. See linkgit:git-submodule[1] and
2026 linkgit:gitmodules[5] for details.
2027
c1a3c364 2028submodule.<name>.fetchRecurseSubmodules::
bf42b384 2029 This option can be used to control recursive fetching of this
469bfc96 2030 submodule. It can be overridden by using the --[no-]recurse-submodules
c1a3c364
JL
2031 command line option to "git fetch" and "git pull".
2032 This setting will override that from in the linkgit:gitmodules[5]
2033 file.
2034
aee9c7d6
JL
2035submodule.<name>.ignore::
2036 Defines under what circumstances "git status" and the diff family show
2037 a submodule as modified. When set to "all", it will never be considered
2038 modified, "dirty" will ignore all changes to the submodules work tree and
2039 takes only differences between the HEAD of the submodule and the commit
2040 recorded in the superproject into account. "untracked" will additionally
2041 let submodules with modified tracked files in their work tree show up.
2042 Using "none" (the default when this option is not set) also shows
2043 submodules that have untracked files in their work tree as changed.
302ad7a9 2044 This setting overrides any setting made in .gitmodules for this submodule,
3776ea9d 2045 both settings can be overridden on the command line by using the
be4f2b40 2046 "--ignore-submodules" option.
aee9c7d6 2047
ce1a79b6 2048tar.umask::
687157c7
RS
2049 This variable can be used to restrict the permission bits of
2050 tar archive entries. The default is 0002, which turns off the
2051 world write bit. The special value "user" indicates that the
2052 archiving user's umask will be used instead. See umask(2) and
5162e697 2053 linkgit:git-archive[1].
ce1a79b6 2054
dab76d3a
JH
2055transfer.fsckObjects::
2056 When `fetch.fsckObjects` or `receive.fsckObjects` are
2057 not set, the value of this variable is used instead.
2058 Defaults to false.
2059
b0f34c3d
MM
2060transfer.unpackLimit::
2061 When `fetch.unpackLimit` or `receive.unpackLimit` are
2062 not set, the value of this variable is used instead.
2063 The default value is 100.
2064
55029ae4
DB
2065url.<base>.insteadOf::
2066 Any URL that starts with this value will be rewritten to
2067 start, instead, with <base>. In cases where some site serves a
2068 large number of repositories, and serves them with multiple
2069 access methods, and some users need to use different access
2070 methods, this feature allows people to specify any of the
2071 equivalent URLs and have git automatically rewrite the URL to
2072 the best alternative for the particular user, even for a
844112ca
JH
2073 never-before-seen repository on the site. When more than one
2074 insteadOf strings match a given URL, the longest match is used.
55029ae4 2075
1c2eafb8
JT
2076url.<base>.pushInsteadOf::
2077 Any URL that starts with this value will not be pushed to;
2078 instead, it will be rewritten to start with <base>, and the
2079 resulting URL will be pushed to. In cases where some site serves
2080 a large number of repositories, and serves them with multiple
2081 access methods, some of which do not allow push, this feature
2082 allows people to specify a pull-only URL and have git
2083 automatically use an appropriate URL to push, even for a
2084 never-before-seen repository on the site. When more than one
2085 pushInsteadOf strings match a given URL, the longest match is
2086 used. If a remote has an explicit pushurl, git will ignore this
2087 setting for that remote.
2088
1ab661dd
PB
2089user.email::
2090 Your email address to be recorded in any newly created commits.
28a94f88 2091 Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
5162e697 2092 'EMAIL' environment variables. See linkgit:git-commit-tree[1].
1ab661dd
PB
2093
2094user.name::
2095 Your full name to be recorded in any newly created commits.
abda1ef5 2096 Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
5162e697 2097 environment variables. See linkgit:git-commit-tree[1].
1ab661dd 2098
d67778ec 2099user.signingkey::
5162e697 2100 If linkgit:git-tag[1] is not selecting the key you want it to
d67778ec
AP
2101 automatically when creating a signed tag, you can override the
2102 default selection with this variable. This option is passed
2103 unchanged to gpg's --local-user parameter, so you may specify a key
2104 using any method that gpg supports.
2105
983a9eeb
CC
2106web.browser::
2107 Specify a web browser that may be used by some commands.
2108 Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
2109 may use it.