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