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