]> git.ipfire.org Git - thirdparty/git.git/blob - Documentation/config.txt
Add "core.eol" config variable
[thirdparty/git.git] / Documentation / config.txt
1 CONFIGURATION FILE
2 ------------------
3
4 The git configuration file contains a number of variables that affect
5 the git command's behavior. The `.git/config` file in each repository
6 is used to store the configuration for that repository, and
7 `$HOME/.gitconfig` is used to store a per-user configuration as
8 fallback values for the `.git/config` file. The file `/etc/gitconfig`
9 can be used to store a system-wide default configuration.
10
11 The configuration variables are used by both the git plumbing
12 and the porcelains. The variables are divided into sections, wherein
13 the fully qualified variable name of the variable itself is the last
14 dot-separated segment and the section name is everything before the last
15 dot. The variable names are case-insensitive and only alphanumeric
16 characters are allowed. Some variables may appear multiple times.
17
18 Syntax
19 ~~~~~~
20
21 The syntax is fairly flexible and permissive; whitespaces are mostly
22 ignored. The '#' and ';' characters begin comments to the end of line,
23 blank lines are ignored.
24
25 The file consists of sections and variables. A section begins with
26 the name of the section in square brackets and continues until the next
27 section begins. Section names are not case sensitive. Only alphanumeric
28 characters, `-` and `.` are allowed in section names. Each variable
29 must belong to some section, which means that there must be a section
30 header before the first setting of a variable.
31
32 Sections can be further divided into subsections. To begin a subsection
33 put its name in double quotes, separated by space from the section name,
34 in the section header, like in the example below:
35
36 --------
37 [section "subsection"]
38
39 --------
40
41 Subsection names are case sensitive and can contain any characters except
42 newline (doublequote `"` and backslash have to be escaped as `\"` and `\\`,
43 respectively). Section headers cannot span multiple
44 lines. Variables may belong directly to a section or to a given subsection.
45 You can have `[section]` if you have `[section "subsection"]`, but you
46 don't need to.
47
48 There is also a case insensitive alternative `[section.subsection]` syntax.
49 In this syntax, subsection names follow the same restrictions as for section
50 names.
51
52 All the other lines (and the remainder of the line after the section
53 header) are recognized as setting variables, in the form
54 'name = value'. If there is no equal sign on the line, the entire line
55 is taken as 'name' and the variable is recognized as boolean "true".
56 The variable names are case-insensitive and only alphanumeric
57 characters and `-` are allowed. There can be more than one value
58 for a given variable; we say then that variable is multivalued.
59
60 Leading and trailing whitespace in a variable value is discarded.
61 Internal whitespace within a variable value is retained verbatim.
62
63 The values following the equals sign in variable assign are all either
64 a string, an integer, or a boolean. Boolean values may be given as yes/no,
65 0/1, true/false or on/off. Case is not significant in boolean values, when
66 converting value to the canonical form using '--bool' type specifier;
67 'git config' will ensure that the output is "true" or "false".
68
69 String values may be entirely or partially enclosed in double quotes.
70 You need to enclose variable values in double quotes if you want to
71 preserve leading or trailing whitespace, or if the variable value contains
72 comment characters (i.e. it contains '#' or ';').
73 Double quote `"` and backslash `\` characters in variable values must
74 be escaped: use `\"` for `"` and `\\` for `\`.
75
76 The following escape sequences (beside `\"` and `\\`) are recognized:
77 `\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
78 and `\b` for backspace (BS). No other char escape sequence, nor octal
79 char sequences are valid.
80
81 Variable values ending in a `\` are continued on the next line in the
82 customary UNIX fashion.
83
84 Some variables may require a special value format.
85
86 Example
87 ~~~~~~~
88
89 # Core variables
90 [core]
91 ; Don't trust file modes
92 filemode = false
93
94 # Our diff algorithm
95 [diff]
96 external = /usr/local/bin/diff-wrapper
97 renames = true
98
99 [branch "devel"]
100 remote = origin
101 merge = refs/heads/devel
102
103 # Proxy settings
104 [core]
105 gitProxy="ssh" for "kernel.org"
106 gitProxy=default-proxy ; for the rest
107
108 Variables
109 ~~~~~~~~~
110
111 Note that this list is non-comprehensive and not necessarily complete.
112 For command-specific variables, you will find a more detailed description
113 in the appropriate manual page. You will find a description of non-core
114 porcelain configuration variables in the respective porcelain documentation.
115
116 advice.*::
117 When set to 'true', display the given optional help message.
118 When set to 'false', do not display. The configuration variables
119 are:
120 +
121 --
122 pushNonFastForward::
123 Advice shown when linkgit:git-push[1] refuses
124 non-fast-forward refs. Default: true.
125 statusHints::
126 Directions on how to stage/unstage/add shown in the
127 output of linkgit:git-status[1] and the template shown
128 when writing commit messages. Default: true.
129 commitBeforeMerge::
130 Advice shown when linkgit:git-merge[1] refuses to
131 merge to avoid overwritting local changes.
132 Default: true.
133 resolveConflict::
134 Advices shown by various commands when conflicts
135 prevent the operation from being performed.
136 Default: true.
137 implicitIdentity::
138 Advice on how to set your identity configuration when
139 your information is guessed from the system username and
140 domain name. Default: true.
141 --
142
143 core.fileMode::
144 If false, the executable bit differences between the index and
145 the working copy are ignored; useful on broken filesystems like FAT.
146 See linkgit:git-update-index[1].
147 +
148 The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
149 will probe and set core.fileMode false if appropriate when the
150 repository is created.
151
152 core.ignoreCygwinFSTricks::
153 This option is only used by Cygwin implementation of Git. If false,
154 the Cygwin stat() and lstat() functions are used. This may be useful
155 if your repository consists of a few separate directories joined in
156 one hierarchy using Cygwin mount. If true, Git uses native Win32 API
157 whenever it is possible and falls back to Cygwin functions only to
158 handle symbol links. The native mode is more than twice faster than
159 normal Cygwin l/stat() functions. True by default, unless core.filemode
160 is true, in which case ignoreCygwinFSTricks is ignored as Cygwin's
161 POSIX emulation is required to support core.filemode.
162
163 core.ignorecase::
164 If true, this option enables various workarounds to enable
165 git to work better on filesystems that are not case sensitive,
166 like FAT. For example, if a directory listing finds
167 "makefile" when git expects "Makefile", git will assume
168 it is really the same file, and continue to remember it as
169 "Makefile".
170 +
171 The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]
172 will probe and set core.ignorecase true if appropriate when the repository
173 is created.
174
175 core.trustctime::
176 If false, the ctime differences between the index and the
177 working copy are ignored; useful when the inode change time
178 is regularly modified by something outside Git (file system
179 crawlers and some backup systems).
180 See linkgit:git-update-index[1]. True by default.
181
182 core.quotepath::
183 The commands that output paths (e.g. 'ls-files',
184 'diff'), when not given the `-z` option, will quote
185 "unusual" characters in the pathname by enclosing the
186 pathname in a double-quote pair and with backslashes the
187 same way strings in C source code are quoted. If this
188 variable is set to false, the bytes higher than 0x80 are
189 not quoted but output as verbatim. Note that double
190 quote, backslash and control characters are always
191 quoted without `-z` regardless of the setting of this
192 variable.
193
194 core.eol::
195 Sets the line ending type to use in the working directory for
196 files that have the `text` property set. Alternatives are
197 'lf', 'crlf' and 'native', which uses the platform's native
198 line ending. The default value is `native`. See
199 linkgit:gitattributes[5] for more information on end-of-line
200 conversion.
201
202 core.safecrlf::
203 If true, makes git check if converting `CRLF` is reversible when
204 end-of-line conversion is active. Git will verify if a command
205 modifies a file in the work tree either directly or indirectly.
206 For example, committing a file followed by checking out the
207 same file should yield the original file in the work tree. If
208 this is not the case for the current setting of
209 `core.autocrlf`, git will reject the file. The variable can
210 be set to "warn", in which case git will only warn about an
211 irreversible conversion but continue the operation.
212 +
213 CRLF conversion bears a slight chance of corrupting data.
214 When it is enabled, git will convert CRLF to LF during commit and LF to
215 CRLF during checkout. A file that contains a mixture of LF and
216 CRLF before the commit cannot be recreated by git. For text
217 files this is the right thing to do: it corrects line endings
218 such that we have only LF line endings in the repository.
219 But for binary files that are accidentally classified as text the
220 conversion can corrupt data.
221 +
222 If you recognize such corruption early you can easily fix it by
223 setting the conversion type explicitly in .gitattributes. Right
224 after committing you still have the original file in your work
225 tree and this file is not yet corrupted. You can explicitly tell
226 git that this file is binary and git will handle the file
227 appropriately.
228 +
229 Unfortunately, the desired effect of cleaning up text files with
230 mixed line endings and the undesired effect of corrupting binary
231 files cannot be distinguished. In both cases CRLFs are removed
232 in an irreversible way. For text files this is the right thing
233 to do because CRLFs are line endings, while for binary files
234 converting CRLFs corrupts data.
235 +
236 Note, this safety check does not mean that a checkout will generate a
237 file identical to the original file for a different setting of
238 `core.eol` and `core.autocrlf`, but only for the current one. For
239 example, a text file with `LF` would be accepted with `core.eol=lf`
240 and could later be checked out with `core.eol=crlf`, in which case the
241 resulting file would contain `CRLF`, although the original file
242 contained `LF`. However, in both work trees the line endings would be
243 consistent, that is either all `LF` or all `CRLF`, but never mixed. A
244 file with mixed line endings would be reported by the `core.safecrlf`
245 mechanism.
246
247 core.autocrlf::
248 Setting this variable to "true" is almost the same as setting
249 the `text` attribute to "auto" on all files except that text
250 files are not guaranteed to be normalized: files that contain
251 `CRLF` in the repository will not be touched. Use this
252 setting if you want to have `CRLF` line endings in your
253 working directory even though the repository does not have
254 normalized line endings. This variable can be set to 'input',
255 in which case no output conversion is performed.
256
257 core.symlinks::
258 If false, symbolic links are checked out as small plain files that
259 contain the link text. linkgit:git-update-index[1] and
260 linkgit:git-add[1] will not change the recorded type to regular
261 file. Useful on filesystems like FAT that do not support
262 symbolic links.
263 +
264 The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
265 will probe and set core.symlinks false if appropriate when the repository
266 is created.
267
268 core.gitProxy::
269 A "proxy command" to execute (as 'command host port') instead
270 of establishing direct connection to the remote server when
271 using the git protocol for fetching. If the variable value is
272 in the "COMMAND for DOMAIN" format, the command is applied only
273 on hostnames ending with the specified domain string. This variable
274 may be set multiple times and is matched in the given order;
275 the first match wins.
276 +
277 Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
278 (which always applies universally, without the special "for"
279 handling).
280 +
281 The special string `none` can be used as the proxy command to
282 specify that no proxy be used for a given domain pattern.
283 This is useful for excluding servers inside a firewall from
284 proxy use, while defaulting to a common proxy for external domains.
285
286 core.ignoreStat::
287 If true, commands which modify both the working tree and the index
288 will mark the updated paths with the "assume unchanged" bit in the
289 index. These marked files are then assumed to stay unchanged in the
290 working copy, until you mark them otherwise manually - Git will not
291 detect the file changes by lstat() calls. This is useful on systems
292 where those are very slow, such as Microsoft Windows.
293 See linkgit:git-update-index[1].
294 False by default.
295
296 core.preferSymlinkRefs::
297 Instead of the default "symref" format for HEAD
298 and other symbolic reference files, use symbolic links.
299 This is sometimes needed to work with old scripts that
300 expect HEAD to be a symbolic link.
301
302 core.bare::
303 If true this repository is assumed to be 'bare' and has no
304 working directory associated with it. If this is the case a
305 number of commands that require a working directory will be
306 disabled, such as linkgit:git-add[1] or linkgit:git-merge[1].
307 +
308 This setting is automatically guessed by linkgit:git-clone[1] or
309 linkgit:git-init[1] when the repository was created. By default a
310 repository that ends in "/.git" is assumed to be not bare (bare =
311 false), while all other repositories are assumed to be bare (bare
312 = true).
313
314 core.worktree::
315 Set the path to the root of the work tree.
316 This can be overridden by the GIT_WORK_TREE environment
317 variable and the '--work-tree' command line option. It can be
318 an absolute path or a relative path to the .git directory,
319 either specified by --git-dir or GIT_DIR, or automatically
320 discovered.
321 If --git-dir or GIT_DIR are specified but none of
322 --work-tree, GIT_WORK_TREE and core.worktree is specified,
323 the current working directory is regarded as the root of the
324 work tree.
325 +
326 Note that this variable is honored even when set in a configuration
327 file in a ".git" subdirectory of a directory, and its value differs
328 from the latter directory (e.g. "/path/to/.git/config" has
329 core.worktree set to "/different/path"), which is most likely a
330 misconfiguration. Running git commands in "/path/to" directory will
331 still use "/different/path" as the root of the work tree and can cause
332 great confusion to the users.
333
334 core.logAllRefUpdates::
335 Enable the reflog. Updates to a ref <ref> is logged to the file
336 "$GIT_DIR/logs/<ref>", by appending the new and old
337 SHA1, the date/time and the reason of the update, but
338 only when the file exists. If this configuration
339 variable is set to true, missing "$GIT_DIR/logs/<ref>"
340 file is automatically created for branch heads.
341 +
342 This information can be used to determine what commit
343 was the tip of a branch "2 days ago".
344 +
345 This value is true by default in a repository that has
346 a working directory associated with it, and false by
347 default in a bare repository.
348
349 core.repositoryFormatVersion::
350 Internal variable identifying the repository format and layout
351 version.
352
353 core.sharedRepository::
354 When 'group' (or 'true'), the repository is made shareable between
355 several users in a group (making sure all the files and objects are
356 group-writable). When 'all' (or 'world' or 'everybody'), the
357 repository will be readable by all users, additionally to being
358 group-shareable. When 'umask' (or 'false'), git will use permissions
359 reported by umask(2). When '0xxx', where '0xxx' is an octal number,
360 files in the repository will have this mode value. '0xxx' will override
361 user's umask value (whereas the other options will only override
362 requested parts of the user's umask value). Examples: '0660' will make
363 the repo read/write-able for the owner and group, but inaccessible to
364 others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a
365 repository that is group-readable but not group-writable.
366 See linkgit:git-init[1]. False by default.
367
368 core.warnAmbiguousRefs::
369 If true, git will warn you if the ref name you passed it is ambiguous
370 and might match multiple refs in the .git/refs/ tree. True by default.
371
372 core.compression::
373 An integer -1..9, indicating a default compression level.
374 -1 is the zlib default. 0 means no compression,
375 and 1..9 are various speed/size tradeoffs, 9 being slowest.
376 If set, this provides a default to other compression variables,
377 such as 'core.loosecompression' and 'pack.compression'.
378
379 core.loosecompression::
380 An integer -1..9, indicating the compression level for objects that
381 are not in a pack file. -1 is the zlib default. 0 means no
382 compression, and 1..9 are various speed/size tradeoffs, 9 being
383 slowest. If not set, defaults to core.compression. If that is
384 not set, defaults to 1 (best speed).
385
386 core.packedGitWindowSize::
387 Number of bytes of a pack file to map into memory in a
388 single mapping operation. Larger window sizes may allow
389 your system to process a smaller number of large pack files
390 more quickly. Smaller window sizes will negatively affect
391 performance due to increased calls to the operating system's
392 memory manager, but may improve performance when accessing
393 a large number of large pack files.
394 +
395 Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32
396 MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should
397 be reasonable for all users/operating systems. You probably do
398 not need to adjust this value.
399 +
400 Common unit suffixes of 'k', 'm', or 'g' are supported.
401
402 core.packedGitLimit::
403 Maximum number of bytes to map simultaneously into memory
404 from pack files. If Git needs to access more than this many
405 bytes at once to complete an operation it will unmap existing
406 regions to reclaim virtual address space within the process.
407 +
408 Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms.
409 This should be reasonable for all users/operating systems, except on
410 the largest projects. You probably do not need to adjust this value.
411 +
412 Common unit suffixes of 'k', 'm', or 'g' are supported.
413
414 core.deltaBaseCacheLimit::
415 Maximum number of bytes to reserve for caching base objects
416 that multiple deltafied objects reference. By storing the
417 entire decompressed base objects in a cache Git is able
418 to avoid unpacking and decompressing frequently used base
419 objects multiple times.
420 +
421 Default is 16 MiB on all platforms. This should be reasonable
422 for all users/operating systems, except on the largest projects.
423 You probably do not need to adjust this value.
424 +
425 Common unit suffixes of 'k', 'm', or 'g' are supported.
426
427 core.bigFileThreshold::
428 Files larger than this size are stored deflated, without
429 attempting delta compression. Storing large files without
430 delta compression avoids excessive memory usage, at the
431 slight expense of increased disk usage.
432 +
433 Default is 512 MiB on all platforms. This should be reasonable
434 for most projects as source code and other text files can still
435 be delta compressed, but larger binary media files won't be.
436 +
437 Common unit suffixes of 'k', 'm', or 'g' are supported.
438 +
439 Currently only linkgit:git-fast-import[1] honors this setting.
440
441 core.excludesfile::
442 In addition to '.gitignore' (per-directory) and
443 '.git/info/exclude', git looks into this file for patterns
444 of files which are not meant to be tracked. "{tilde}/" is expanded
445 to the value of `$HOME` and "{tilde}user/" to the specified user's
446 home directory. See linkgit:gitignore[5].
447
448 core.editor::
449 Commands such as `commit` and `tag` that lets you edit
450 messages by launching an editor uses the value of this
451 variable when it is set, and the environment variable
452 `GIT_EDITOR` is not set. See linkgit:git-var[1].
453
454 core.pager::
455 The command that git will use to paginate output. Can
456 be overridden with the `GIT_PAGER` environment
457 variable. Note that git sets the `LESS` environment
458 variable to `FRSX` if it is unset when it runs the
459 pager. One can change these settings by setting the
460 `LESS` variable to some other value. Alternately,
461 these settings can be overridden on a project or
462 global basis by setting the `core.pager` option.
463 Setting `core.pager` has no affect on the `LESS`
464 environment variable behaviour above, so if you want
465 to override git's default settings this way, you need
466 to be explicit. For example, to disable the S option
467 in a backward compatible manner, set `core.pager`
468 to `less -+$LESS -FRX`. This will be passed to the
469 shell by git, which will translate the final command to
470 `LESS=FRSX less -+FRSX -FRX`.
471
472 core.whitespace::
473 A comma separated list of common whitespace problems to
474 notice. 'git diff' will use `color.diff.whitespace` to
475 highlight them, and 'git apply --whitespace=error' will
476 consider them as errors. You can prefix `-` to disable
477 any of them (e.g. `-trailing-space`):
478 +
479 * `blank-at-eol` treats trailing whitespaces at the end of the line
480 as an error (enabled by default).
481 * `space-before-tab` treats a space character that appears immediately
482 before a tab character in the initial indent part of the line as an
483 error (enabled by default).
484 * `indent-with-non-tab` treats a line that is indented with 8 or more
485 space characters as an error (not enabled by default).
486 * `blank-at-eof` treats blank lines added at the end of file as an error
487 (enabled by default).
488 * `trailing-space` is a short-hand to cover both `blank-at-eol` and
489 `blank-at-eof`.
490 * `cr-at-eol` treats a carriage-return at the end of line as
491 part of the line terminator, i.e. with it, `trailing-space`
492 does not trigger if the character before such a carriage-return
493 is not a whitespace (not enabled by default).
494
495 core.fsyncobjectfiles::
496 This boolean will enable 'fsync()' when writing object files.
497 +
498 This is a total waste of time and effort on a filesystem that orders
499 data writes properly, but can be useful for filesystems that do not use
500 journalling (traditional UNIX filesystems) or that only journal metadata
501 and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
502
503 core.preloadindex::
504 Enable parallel index preload for operations like 'git diff'
505 +
506 This can speed up operations like 'git diff' and 'git status' especially
507 on filesystems like NFS that have weak caching semantics and thus
508 relatively high IO latencies. With this set to 'true', git will do the
509 index comparison to the filesystem data in parallel, allowing
510 overlapping IO's.
511
512 core.createObject::
513 You can set this to 'link', in which case a hardlink followed by
514 a delete of the source are used to make sure that object creation
515 will not overwrite existing objects.
516 +
517 On some file system/operating system combinations, this is unreliable.
518 Set this config setting to 'rename' there; However, This will remove the
519 check that makes sure that existing object files will not get overwritten.
520
521 core.notesRef::
522 When showing commit messages, also show notes which are stored in
523 the given ref. This ref is expected to contain files named
524 after the full SHA-1 of the commit they annotate.
525 +
526 If such a file exists in the given ref, the referenced blob is read, and
527 appended to the commit message, separated by a "Notes:" line. If the
528 given ref itself does not exist, it is not an error, but means that no
529 notes should be printed.
530 +
531 This setting defaults to "refs/notes/commits", and can be overridden by
532 the `GIT_NOTES_REF` environment variable.
533
534 core.sparseCheckout::
535 Enable "sparse checkout" feature. See section "Sparse checkout" in
536 linkgit:git-read-tree[1] for more information.
537
538 add.ignore-errors::
539 Tells 'git add' to continue adding files when some files cannot be
540 added due to indexing errors. Equivalent to the '--ignore-errors'
541 option of linkgit:git-add[1].
542
543 alias.*::
544 Command aliases for the linkgit:git[1] command wrapper - e.g.
545 after defining "alias.last = cat-file commit HEAD", the invocation
546 "git last" is equivalent to "git cat-file commit HEAD". To avoid
547 confusion and troubles with script usage, aliases that
548 hide existing git commands are ignored. Arguments are split by
549 spaces, the usual shell quoting and escaping is supported.
550 quote pair and a backslash can be used to quote them.
551 +
552 If the alias expansion is prefixed with an exclamation point,
553 it will be treated as a shell command. For example, defining
554 "alias.new = !gitk --all --not ORIG_HEAD", the invocation
555 "git new" is equivalent to running the shell command
556 "gitk --all --not ORIG_HEAD". Note that shell commands will be
557 executed from the top-level directory of a repository, which may
558 not necessarily be the current directory.
559
560 apply.ignorewhitespace::
561 When set to 'change', tells 'git apply' to ignore changes in
562 whitespace, in the same way as the '--ignore-space-change'
563 option.
564 When set to one of: no, none, never, false tells 'git apply' to
565 respect all whitespace differences.
566 See linkgit:git-apply[1].
567
568 apply.whitespace::
569 Tells 'git apply' how to handle whitespaces, in the same way
570 as the '--whitespace' option. See linkgit:git-apply[1].
571
572 branch.autosetupmerge::
573 Tells 'git branch' and 'git checkout' to set up new branches
574 so that linkgit:git-pull[1] will appropriately merge from the
575 starting point branch. Note that even if this option is not set,
576 this behavior can be chosen per-branch using the `--track`
577 and `--no-track` options. The valid settings are: `false` -- no
578 automatic setup is done; `true` -- automatic setup is done when the
579 starting point is a remote branch; `always` -- automatic setup is
580 done when the starting point is either a local branch or remote
581 branch. This option defaults to true.
582
583 branch.autosetuprebase::
584 When a new branch is created with 'git branch' or 'git checkout'
585 that tracks another branch, this variable tells git to set
586 up pull to rebase instead of merge (see "branch.<name>.rebase").
587 When `never`, rebase is never automatically set to true.
588 When `local`, rebase is set to true for tracked branches of
589 other local branches.
590 When `remote`, rebase is set to true for tracked branches of
591 remote branches.
592 When `always`, rebase will be set to true for all tracking
593 branches.
594 See "branch.autosetupmerge" for details on how to set up a
595 branch to track another branch.
596 This option defaults to never.
597
598 branch.<name>.remote::
599 When in branch <name>, it tells 'git fetch' and 'git push' which
600 remote to fetch from/push to. It defaults to `origin` if no remote is
601 configured. `origin` is also used if you are not on any branch.
602
603 branch.<name>.merge::
604 Defines, together with branch.<name>.remote, the upstream branch
605 for the given branch. It tells 'git fetch'/'git pull' which
606 branch to merge and can also affect 'git push' (see push.default).
607 When in branch <name>, it tells 'git fetch' the default
608 refspec to be marked for merging in FETCH_HEAD. The value is
609 handled like the remote part of a refspec, and must match a
610 ref which is fetched from the remote given by
611 "branch.<name>.remote".
612 The merge information is used by 'git pull' (which at first calls
613 'git fetch') to lookup the default branch for merging. Without
614 this option, 'git pull' defaults to merge the first refspec fetched.
615 Specify multiple values to get an octopus merge.
616 If you wish to setup 'git pull' so that it merges into <name> from
617 another branch in the local repository, you can point
618 branch.<name>.merge to the desired branch, and use the special setting
619 `.` (a period) for branch.<name>.remote.
620
621 branch.<name>.mergeoptions::
622 Sets default options for merging into branch <name>. The syntax and
623 supported options are the same as those of linkgit:git-merge[1], but
624 option values containing whitespace characters are currently not
625 supported.
626
627 branch.<name>.rebase::
628 When true, rebase the branch <name> on top of the fetched branch,
629 instead of merging the default branch from the default remote when
630 "git pull" is run.
631 *NOTE*: this is a possibly dangerous operation; do *not* use
632 it unless you understand the implications (see linkgit:git-rebase[1]
633 for details).
634
635 browser.<tool>.cmd::
636 Specify the command to invoke the specified browser. The
637 specified command is evaluated in shell with the URLs passed
638 as arguments. (See linkgit:git-web--browse[1].)
639
640 browser.<tool>.path::
641 Override the path for the given tool that may be used to
642 browse HTML help (see '-w' option in linkgit:git-help[1]) or a
643 working repository in gitweb (see linkgit:git-instaweb[1]).
644
645 clean.requireForce::
646 A boolean to make git-clean do nothing unless given -f
647 or -n. Defaults to true.
648
649 color.branch::
650 A boolean to enable/disable color in the output of
651 linkgit:git-branch[1]. May be set to `always`,
652 `false` (or `never`) or `auto` (or `true`), in which case colors are used
653 only when the output is to a terminal. Defaults to false.
654
655 color.branch.<slot>::
656 Use customized color for branch coloration. `<slot>` is one of
657 `current` (the current branch), `local` (a local branch),
658 `remote` (a tracking branch in refs/remotes/), `plain` (other
659 refs).
660 +
661 The value for these configuration variables is a list of colors (at most
662 two) and attributes (at most one), separated by spaces. The colors
663 accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
664 `magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`,
665 `blink` and `reverse`. The first color given is the foreground; the
666 second is the background. The position of the attribute, if any,
667 doesn't matter.
668
669 color.diff::
670 When set to `always`, always use colors in patch.
671 When false (or `never`), never. When set to `true` or `auto`, use
672 colors only when the output is to the terminal. Defaults to false.
673
674 color.diff.<slot>::
675 Use customized color for diff colorization. `<slot>` specifies
676 which part of the patch to use the specified color, and is one
677 of `plain` (context text), `meta` (metainformation), `frag`
678 (hunk header), 'func' (function in hunk header), `old` (removed lines),
679 `new` (added lines), `commit` (commit headers), or `whitespace`
680 (highlighting whitespace errors). The values of these variables may be
681 specified as in color.branch.<slot>.
682
683 color.grep::
684 When set to `always`, always highlight matches. When `false` (or
685 `never`), never. When set to `true` or `auto`, use color only
686 when the output is written to the terminal. Defaults to `false`.
687
688 color.grep.match::
689 Use customized color for matches. The value of this variable
690 may be specified as in color.branch.<slot>. It is passed using
691 the environment variables 'GREP_COLOR' and 'GREP_COLORS' when
692 calling an external 'grep'.
693
694 color.interactive::
695 When set to `always`, always use colors for interactive prompts
696 and displays (such as those used by "git-add --interactive").
697 When false (or `never`), never. When set to `true` or `auto`, use
698 colors only when the output is to the terminal. Defaults to false.
699
700 color.interactive.<slot>::
701 Use customized color for 'git add --interactive'
702 output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
703 four distinct types of normal output from interactive
704 commands. The values of these variables may be specified as
705 in color.branch.<slot>.
706
707 color.pager::
708 A boolean to enable/disable colored output when the pager is in
709 use (default is true).
710
711 color.showbranch::
712 A boolean to enable/disable color in the output of
713 linkgit:git-show-branch[1]. May be set to `always`,
714 `false` (or `never`) or `auto` (or `true`), in which case colors are used
715 only when the output is to a terminal. Defaults to false.
716
717 color.status::
718 A boolean to enable/disable color in the output of
719 linkgit:git-status[1]. May be set to `always`,
720 `false` (or `never`) or `auto` (or `true`), in which case colors are used
721 only when the output is to a terminal. Defaults to false.
722
723 color.status.<slot>::
724 Use customized color for status colorization. `<slot>` is
725 one of `header` (the header text of the status message),
726 `added` or `updated` (files which are added but not committed),
727 `changed` (files which are changed but not added in the index),
728 `untracked` (files which are not tracked by git), or
729 `nobranch` (the color the 'no branch' warning is shown in, defaulting
730 to red). The values of these variables may be specified as in
731 color.branch.<slot>.
732
733 color.ui::
734 When set to `always`, always use colors in all git commands which
735 are capable of colored output. When false (or `never`), never. When
736 set to `true` or `auto`, use colors only when the output is to the
737 terminal. When more specific variables of color.* are set, they always
738 take precedence over this setting. Defaults to false.
739
740 commit.status::
741 A boolean to enable/disable inclusion of status information in the
742 commit message template when using an editor to prepare the commit
743 message. Defaults to true.
744
745 commit.template::
746 Specify a file to use as the template for new commit messages.
747 "{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
748 specified user's home directory.
749
750 diff.autorefreshindex::
751 When using 'git diff' to compare with work tree
752 files, do not consider stat-only change as changed.
753 Instead, silently run `git update-index --refresh` to
754 update the cached stat information for paths whose
755 contents in the work tree match the contents in the
756 index. This option defaults to true. Note that this
757 affects only 'git diff' Porcelain, and not lower level
758 'diff' commands such as 'git diff-files'.
759
760 diff.external::
761 If this config variable is set, diff generation is not
762 performed using the internal diff machinery, but using the
763 given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
764 environment variable. The command is called with parameters
765 as described under "git Diffs" in linkgit:git[1]. Note: if
766 you want to use an external diff program only on a subset of
767 your files, you might want to use linkgit:gitattributes[5] instead.
768
769 diff.mnemonicprefix::
770 If set, 'git diff' uses a prefix pair that is different from the
771 standard "a/" and "b/" depending on what is being compared. When
772 this configuration is in effect, reverse diff output also swaps
773 the order of the prefixes:
774 `git diff`;;
775 compares the (i)ndex and the (w)ork tree;
776 `git diff HEAD`;;
777 compares a (c)ommit and the (w)ork tree;
778 `git diff --cached`;;
779 compares a (c)ommit and the (i)ndex;
780 `git diff HEAD:file1 file2`;;
781 compares an (o)bject and a (w)ork tree entity;
782 `git diff --no-index a b`;;
783 compares two non-git things (1) and (2).
784
785 diff.renameLimit::
786 The number of files to consider when performing the copy/rename
787 detection; equivalent to the 'git diff' option '-l'.
788
789 diff.renames::
790 Tells git to detect renames. If set to any boolean value, it
791 will enable basic rename detection. If set to "copies" or
792 "copy", it will detect copies, as well.
793
794 diff.suppressBlankEmpty::
795 A boolean to inhibit the standard behavior of printing a space
796 before each empty output line. Defaults to false.
797
798 diff.tool::
799 Controls which diff tool is used. `diff.tool` overrides
800 `merge.tool` when used by linkgit:git-difftool[1] and has
801 the same valid values as `merge.tool` minus "tortoisemerge"
802 and plus "kompare".
803
804 difftool.<tool>.path::
805 Override the path for the given tool. This is useful in case
806 your tool is not in the PATH.
807
808 difftool.<tool>.cmd::
809 Specify the command to invoke the specified diff tool.
810 The specified command is evaluated in shell with the following
811 variables available: 'LOCAL' is set to the name of the temporary
812 file containing the contents of the diff pre-image and 'REMOTE'
813 is set to the name of the temporary file containing the contents
814 of the diff post-image.
815
816 difftool.prompt::
817 Prompt before each invocation of the diff tool.
818
819 diff.wordRegex::
820 A POSIX Extended Regular Expression used to determine what is a "word"
821 when performing word-by-word difference calculations. Character
822 sequences that match the regular expression are "words", all other
823 characters are *ignorable* whitespace.
824
825 fetch.unpackLimit::
826 If the number of objects fetched over the git native
827 transfer is below this
828 limit, then the objects will be unpacked into loose object
829 files. However if the number of received objects equals or
830 exceeds this limit then the received pack will be stored as
831 a pack, after adding any missing delta bases. Storing the
832 pack from a push can make the push operation complete faster,
833 especially on slow filesystems. If not set, the value of
834 `transfer.unpackLimit` is used instead.
835
836 format.attach::
837 Enable multipart/mixed attachments as the default for
838 'format-patch'. The value can also be a double quoted string
839 which will enable attachments as the default and set the
840 value as the boundary. See the --attach option in
841 linkgit:git-format-patch[1].
842
843 format.numbered::
844 A boolean which can enable or disable sequence numbers in patch
845 subjects. It defaults to "auto" which enables it only if there
846 is more than one patch. It can be enabled or disabled for all
847 messages by setting it to "true" or "false". See --numbered
848 option in linkgit:git-format-patch[1].
849
850 format.headers::
851 Additional email headers to include in a patch to be submitted
852 by mail. See linkgit:git-format-patch[1].
853
854 format.cc::
855 Additional "Cc:" headers to include in a patch to be submitted
856 by mail. See the --cc option in linkgit:git-format-patch[1].
857
858 format.subjectprefix::
859 The default for format-patch is to output files with the '[PATCH]'
860 subject prefix. Use this variable to change that prefix.
861
862 format.suffix::
863 The default for format-patch is to output files with the suffix
864 `.patch`. Use this variable to change that suffix (make sure to
865 include the dot if you want it).
866
867 format.pretty::
868 The default pretty format for log/show/whatchanged command,
869 See linkgit:git-log[1], linkgit:git-show[1],
870 linkgit:git-whatchanged[1].
871
872 format.thread::
873 The default threading style for 'git format-patch'. Can be
874 a boolean value, or `shallow` or `deep`. `shallow` threading
875 makes every mail a reply to the head of the series,
876 where the head is chosen from the cover letter, the
877 `\--in-reply-to`, and the first patch mail, in this order.
878 `deep` threading makes every mail a reply to the previous one.
879 A true boolean value is the same as `shallow`, and a false
880 value disables threading.
881
882 format.signoff::
883 A boolean value which lets you enable the `-s/--signoff` option of
884 format-patch by default. *Note:* Adding the Signed-off-by: line to a
885 patch should be a conscious act and means that you certify you have
886 the rights to submit this work under the same open source license.
887 Please see the 'SubmittingPatches' document for further discussion.
888
889 gc.aggressiveWindow::
890 The window size parameter used in the delta compression
891 algorithm used by 'git gc --aggressive'. This defaults
892 to 10.
893
894 gc.auto::
895 When there are approximately more than this many loose
896 objects in the repository, `git gc --auto` will pack them.
897 Some Porcelain commands use this command to perform a
898 light-weight garbage collection from time to time. The
899 default value is 6700. Setting this to 0 disables it.
900
901 gc.autopacklimit::
902 When there are more than this many packs that are not
903 marked with `*.keep` file in the repository, `git gc
904 --auto` consolidates them into one larger pack. The
905 default value is 50. Setting this to 0 disables it.
906
907 gc.packrefs::
908 Running `git pack-refs` in a repository renders it
909 unclonable by Git versions prior to 1.5.1.2 over dumb
910 transports such as HTTP. This variable determines whether
911 'git gc' runs `git pack-refs`. This can be set to `nobare`
912 to enable it within all non-bare repos or it can be set to a
913 boolean value. The default is `true`.
914
915 gc.pruneexpire::
916 When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
917 Override the grace period with this config variable. The value
918 "now" may be used to disable this grace period and always prune
919 unreachable objects immediately.
920
921 gc.reflogexpire::
922 'git reflog expire' removes reflog entries older than
923 this time; defaults to 90 days.
924
925 gc.reflogexpireunreachable::
926 'git reflog expire' removes reflog entries older than
927 this time and are not reachable from the current tip;
928 defaults to 30 days.
929
930 gc.rerereresolved::
931 Records of conflicted merge you resolved earlier are
932 kept for this many days when 'git rerere gc' is run.
933 The default is 60 days. See linkgit:git-rerere[1].
934
935 gc.rerereunresolved::
936 Records of conflicted merge you have not resolved are
937 kept for this many days when 'git rerere gc' is run.
938 The default is 15 days. See linkgit:git-rerere[1].
939
940 gitcvs.commitmsgannotation::
941 Append this string to each commit message. Set to empty string
942 to disable this feature. Defaults to "via git-CVS emulator".
943
944 gitcvs.enabled::
945 Whether the CVS server interface is enabled for this repository.
946 See linkgit:git-cvsserver[1].
947
948 gitcvs.logfile::
949 Path to a log file where the CVS server interface well... logs
950 various stuff. See linkgit:git-cvsserver[1].
951
952 gitcvs.usecrlfattr::
953 If true, the server will look up the end-of-line conversion
954 attributes for files to determine the '-k' modes to use. If
955 the attributes force git to treat a file as text,
956 the '-k' mode will be left blank so cvs clients will
957 treat it as text. If they suppress text conversion, the file
958 will be set with '-kb' mode, which suppresses any newline munging
959 the client might otherwise do. If the attributes do not allow
960 the file type to be determined, then 'gitcvs.allbinary' is
961 used. See linkgit:gitattributes[5].
962
963 gitcvs.allbinary::
964 This is used if 'gitcvs.usecrlfattr' does not resolve
965 the correct '-kb' mode to use. If true, all
966 unresolved files are sent to the client in
967 mode '-kb'. This causes the client to treat them
968 as binary files, which suppresses any newline munging it
969 otherwise might do. Alternatively, if it is set to "guess",
970 then the contents of the file are examined to decide if
971 it is binary, similar to 'core.autocrlf'.
972
973 gitcvs.dbname::
974 Database used by git-cvsserver to cache revision information
975 derived from the git repository. The exact meaning depends on the
976 used database driver, for SQLite (which is the default driver) this
977 is a filename. Supports variable substitution (see
978 linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).
979 Default: '%Ggitcvs.%m.sqlite'
980
981 gitcvs.dbdriver::
982 Used Perl DBI driver. You can specify any available driver
983 for this here, but it might not work. git-cvsserver is tested
984 with 'DBD::SQLite', reported to work with 'DBD::Pg', and
985 reported *not* to work with 'DBD::mysql'. Experimental feature.
986 May not contain double colons (`:`). Default: 'SQLite'.
987 See linkgit:git-cvsserver[1].
988
989 gitcvs.dbuser, gitcvs.dbpass::
990 Database user and password. Only useful if setting 'gitcvs.dbdriver',
991 since SQLite has no concept of database users and/or passwords.
992 'gitcvs.dbuser' supports variable substitution (see
993 linkgit:git-cvsserver[1] for details).
994
995 gitcvs.dbTableNamePrefix::
996 Database table name prefix. Prepended to the names of any
997 database tables used, allowing a single database to be used
998 for several repositories. Supports variable substitution (see
999 linkgit:git-cvsserver[1] for details). Any non-alphabetic
1000 characters will be replaced with underscores.
1001
1002 All gitcvs variables except for 'gitcvs.usecrlfattr' and
1003 'gitcvs.allbinary' can also be specified as
1004 'gitcvs.<access_method>.<varname>' (where 'access_method'
1005 is one of "ext" and "pserver") to make them apply only for the given
1006 access method.
1007
1008 gui.commitmsgwidth::
1009 Defines how wide the commit message window is in the
1010 linkgit:git-gui[1]. "75" is the default.
1011
1012 gui.diffcontext::
1013 Specifies how many context lines should be used in calls to diff
1014 made by the linkgit:git-gui[1]. The default is "5".
1015
1016 gui.encoding::
1017 Specifies the default encoding to use for displaying of
1018 file contents in linkgit:git-gui[1] and linkgit:gitk[1].
1019 It can be overridden by setting the 'encoding' attribute
1020 for relevant files (see linkgit:gitattributes[5]).
1021 If this option is not set, the tools default to the
1022 locale encoding.
1023
1024 gui.matchtrackingbranch::
1025 Determines if new branches created with linkgit:git-gui[1] should
1026 default to tracking remote branches with matching names or
1027 not. Default: "false".
1028
1029 gui.newbranchtemplate::
1030 Is used as suggested name when creating new branches using the
1031 linkgit:git-gui[1].
1032
1033 gui.pruneduringfetch::
1034 "true" if linkgit:git-gui[1] should prune tracking branches when
1035 performing a fetch. The default value is "false".
1036
1037 gui.trustmtime::
1038 Determines if linkgit:git-gui[1] should trust the file modification
1039 timestamp or not. By default the timestamps are not trusted.
1040
1041 gui.spellingdictionary::
1042 Specifies the dictionary used for spell checking commit messages in
1043 the linkgit:git-gui[1]. When set to "none" spell checking is turned
1044 off.
1045
1046 gui.fastcopyblame::
1047 If true, 'git gui blame' uses `-C` instead of `-C -C` for original
1048 location detection. It makes blame significantly faster on huge
1049 repositories at the expense of less thorough copy detection.
1050
1051 gui.copyblamethreshold::
1052 Specifies the threshold to use in 'git gui blame' original location
1053 detection, measured in alphanumeric characters. See the
1054 linkgit:git-blame[1] manual for more information on copy detection.
1055
1056 gui.blamehistoryctx::
1057 Specifies the radius of history context in days to show in
1058 linkgit:gitk[1] for the selected commit, when the `Show History
1059 Context` menu item is invoked from 'git gui blame'. If this
1060 variable is set to zero, the whole history is shown.
1061
1062 guitool.<name>.cmd::
1063 Specifies the shell command line to execute when the corresponding item
1064 of the linkgit:git-gui[1] `Tools` menu is invoked. This option is
1065 mandatory for every tool. The command is executed from the root of
1066 the working directory, and in the environment it receives the name of
1067 the tool as 'GIT_GUITOOL', the name of the currently selected file as
1068 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if
1069 the head is detached, 'CUR_BRANCH' is empty).
1070
1071 guitool.<name>.needsfile::
1072 Run the tool only if a diff is selected in the GUI. It guarantees
1073 that 'FILENAME' is not empty.
1074
1075 guitool.<name>.noconsole::
1076 Run the command silently, without creating a window to display its
1077 output.
1078
1079 guitool.<name>.norescan::
1080 Don't rescan the working directory for changes after the tool
1081 finishes execution.
1082
1083 guitool.<name>.confirm::
1084 Show a confirmation dialog before actually running the tool.
1085
1086 guitool.<name>.argprompt::
1087 Request a string argument from the user, and pass it to the tool
1088 through the 'ARGS' environment variable. Since requesting an
1089 argument implies confirmation, the 'confirm' option has no effect
1090 if this is enabled. If the option is set to 'true', 'yes', or '1',
1091 the dialog uses a built-in generic prompt; otherwise the exact
1092 value of the variable is used.
1093
1094 guitool.<name>.revprompt::
1095 Request a single valid revision from the user, and set the
1096 'REVISION' environment variable. In other aspects this option
1097 is similar to 'argprompt', and can be used together with it.
1098
1099 guitool.<name>.revunmerged::
1100 Show only unmerged branches in the 'revprompt' subdialog.
1101 This is useful for tools similar to merge or rebase, but not
1102 for things like checkout or reset.
1103
1104 guitool.<name>.title::
1105 Specifies the title to use for the prompt dialog. The default
1106 is the tool name.
1107
1108 guitool.<name>.prompt::
1109 Specifies the general prompt string to display at the top of
1110 the dialog, before subsections for 'argprompt' and 'revprompt'.
1111 The default value includes the actual command.
1112
1113 help.browser::
1114 Specify the browser that will be used to display help in the
1115 'web' format. See linkgit:git-help[1].
1116
1117 help.format::
1118 Override the default help format used by linkgit:git-help[1].
1119 Values 'man', 'info', 'web' and 'html' are supported. 'man' is
1120 the default. 'web' and 'html' are the same.
1121
1122 help.autocorrect::
1123 Automatically correct and execute mistyped commands after
1124 waiting for the given number of deciseconds (0.1 sec). If more
1125 than one command can be deduced from the entered text, nothing
1126 will be executed. If the value of this option is negative,
1127 the corrected command will be executed immediately. If the
1128 value is 0 - the command will be just shown but not executed.
1129 This is the default.
1130
1131 http.proxy::
1132 Override the HTTP proxy, normally configured using the 'http_proxy'
1133 environment variable (see linkgit:curl[1]). This can be overridden
1134 on a per-remote basis; see remote.<name>.proxy
1135
1136 http.sslVerify::
1137 Whether to verify the SSL certificate when fetching or pushing
1138 over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
1139 variable.
1140
1141 http.sslCert::
1142 File containing the SSL certificate when fetching or pushing
1143 over HTTPS. Can be overridden by the 'GIT_SSL_CERT' environment
1144 variable.
1145
1146 http.sslKey::
1147 File containing the SSL private key when fetching or pushing
1148 over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment
1149 variable.
1150
1151 http.sslCertPasswordProtected::
1152 Enable git's password prompt for the SSL certificate. Otherwise
1153 OpenSSL will prompt the user, possibly many times, if the
1154 certificate or private key is encrypted. Can be overridden by the
1155 'GIT_SSL_CERT_PASSWORD_PROTECTED' environment variable.
1156
1157 http.sslCAInfo::
1158 File containing the certificates to verify the peer with when
1159 fetching or pushing over HTTPS. Can be overridden by the
1160 'GIT_SSL_CAINFO' environment variable.
1161
1162 http.sslCAPath::
1163 Path containing files with the CA certificates to verify the peer
1164 with when fetching or pushing over HTTPS. Can be overridden
1165 by the 'GIT_SSL_CAPATH' environment variable.
1166
1167 http.maxRequests::
1168 How many HTTP requests to launch in parallel. Can be overridden
1169 by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
1170
1171 http.minSessions::
1172 The number of curl sessions (counted across slots) to be kept across
1173 requests. They will not be ended with curl_easy_cleanup() until
1174 http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this
1175 value will be capped at 1. Defaults to 1.
1176
1177 http.postBuffer::
1178 Maximum size in bytes of the buffer used by smart HTTP
1179 transports when POSTing data to the remote system.
1180 For requests larger than this buffer size, HTTP/1.1 and
1181 Transfer-Encoding: chunked is used to avoid creating a
1182 massive pack file locally. Default is 1 MiB, which is
1183 sufficient for most requests.
1184
1185 http.lowSpeedLimit, http.lowSpeedTime::
1186 If the HTTP transfer speed is less than 'http.lowSpeedLimit'
1187 for longer than 'http.lowSpeedTime' seconds, the transfer is aborted.
1188 Can be overridden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and
1189 'GIT_HTTP_LOW_SPEED_TIME' environment variables.
1190
1191 http.noEPSV::
1192 A boolean which disables using of EPSV ftp command by curl.
1193 This can helpful with some "poor" ftp servers which don't
1194 support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'
1195 environment variable. Default is false (curl will use EPSV).
1196
1197 i18n.commitEncoding::
1198 Character encoding the commit messages are stored in; git itself
1199 does not care per se, but this information is necessary e.g. when
1200 importing commits from emails or in the gitk graphical history
1201 browser (and possibly at other places in the future or in other
1202 porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
1203
1204 i18n.logOutputEncoding::
1205 Character encoding the commit messages are converted to when
1206 running 'git log' and friends.
1207
1208 imap::
1209 The configuration variables in the 'imap' section are described
1210 in linkgit:git-imap-send[1].
1211
1212 instaweb.browser::
1213 Specify the program that will be used to browse your working
1214 repository in gitweb. See linkgit:git-instaweb[1].
1215
1216 instaweb.httpd::
1217 The HTTP daemon command-line to start gitweb on your working
1218 repository. See linkgit:git-instaweb[1].
1219
1220 instaweb.local::
1221 If true the web server started by linkgit:git-instaweb[1] will
1222 be bound to the local IP (127.0.0.1).
1223
1224 instaweb.modulepath::
1225 The module path for an apache httpd used by linkgit:git-instaweb[1].
1226
1227 instaweb.port::
1228 The port number to bind the gitweb httpd to. See
1229 linkgit:git-instaweb[1].
1230
1231 interactive.singlekey::
1232 In interactive commands, allow the user to provide one-letter
1233 input with a single key (i.e., without hitting enter).
1234 Currently this is used only by the `\--patch` mode of
1235 linkgit:git-add[1]. Note that this setting is silently
1236 ignored if portable keystroke input is not available.
1237
1238 log.date::
1239 Set default date-time mode for the log command. Setting log.date
1240 value is similar to using 'git log'\'s --date option. The value is one of the
1241 following alternatives: {relative,local,default,iso,rfc,short}.
1242 See linkgit:git-log[1].
1243
1244 log.showroot::
1245 If true, the initial commit will be shown as a big creation event.
1246 This is equivalent to a diff against an empty tree.
1247 Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
1248 normally hide the root commit will now show it. True by default.
1249
1250 mailmap.file::
1251 The location of an augmenting mailmap file. The default
1252 mailmap, located in the root of the repository, is loaded
1253 first, then the mailmap file pointed to by this variable.
1254 The location of the mailmap file may be in a repository
1255 subdirectory, or somewhere outside of the repository itself.
1256 See linkgit:git-shortlog[1] and linkgit:git-blame[1].
1257
1258 man.viewer::
1259 Specify the programs that may be used to display help in the
1260 'man' format. See linkgit:git-help[1].
1261
1262 man.<tool>.cmd::
1263 Specify the command to invoke the specified man viewer. The
1264 specified command is evaluated in shell with the man page
1265 passed as argument. (See linkgit:git-help[1].)
1266
1267 man.<tool>.path::
1268 Override the path for the given tool that may be used to
1269 display help in the 'man' format. See linkgit:git-help[1].
1270
1271 include::merge-config.txt[]
1272
1273 mergetool.<tool>.path::
1274 Override the path for the given tool. This is useful in case
1275 your tool is not in the PATH.
1276
1277 mergetool.<tool>.cmd::
1278 Specify the command to invoke the specified merge tool. The
1279 specified command is evaluated in shell with the following
1280 variables available: 'BASE' is the name of a temporary file
1281 containing the common base of the files to be merged, if available;
1282 'LOCAL' is the name of a temporary file containing the contents of
1283 the file on the current branch; 'REMOTE' is the name of a temporary
1284 file containing the contents of the file from the branch being
1285 merged; 'MERGED' contains the name of the file to which the merge
1286 tool should write the results of a successful merge.
1287
1288 mergetool.<tool>.trustExitCode::
1289 For a custom merge command, specify whether the exit code of
1290 the merge command can be used to determine whether the merge was
1291 successful. If this is not set to true then the merge target file
1292 timestamp is checked and the merge assumed to have been successful
1293 if the file has been updated, otherwise the user is prompted to
1294 indicate the success of the merge.
1295
1296 mergetool.keepBackup::
1297 After performing a merge, the original file with conflict markers
1298 can be saved as a file with a `.orig` extension. If this variable
1299 is set to `false` then this file is not preserved. Defaults to
1300 `true` (i.e. keep the backup files).
1301
1302 mergetool.keepTemporaries::
1303 When invoking a custom merge tool, git uses a set of temporary
1304 files to pass to the tool. If the tool returns an error and this
1305 variable is set to `true`, then these temporary files will be
1306 preserved, otherwise they will be removed after the tool has
1307 exited. Defaults to `false`.
1308
1309 mergetool.prompt::
1310 Prompt before each invocation of the merge resolution program.
1311
1312 pack.window::
1313 The size of the window used by linkgit:git-pack-objects[1] when no
1314 window size is given on the command line. Defaults to 10.
1315
1316 pack.depth::
1317 The maximum delta depth used by linkgit:git-pack-objects[1] when no
1318 maximum depth is given on the command line. Defaults to 50.
1319
1320 pack.windowMemory::
1321 The window memory size limit used by linkgit:git-pack-objects[1]
1322 when no limit is given on the command line. The value can be
1323 suffixed with "k", "m", or "g". Defaults to 0, meaning no
1324 limit.
1325
1326 pack.compression::
1327 An integer -1..9, indicating the compression level for objects
1328 in a pack file. -1 is the zlib default. 0 means no
1329 compression, and 1..9 are various speed/size tradeoffs, 9 being
1330 slowest. If not set, defaults to core.compression. If that is
1331 not set, defaults to -1, the zlib default, which is "a default
1332 compromise between speed and compression (currently equivalent
1333 to level 6)."
1334
1335 pack.deltaCacheSize::
1336 The maximum memory in bytes used for caching deltas in
1337 linkgit:git-pack-objects[1] before writing them out to a pack.
1338 This cache is used to speed up the writing object phase by not
1339 having to recompute the final delta result once the best match
1340 for all objects is found. Repacking large repositories on machines
1341 which are tight with memory might be badly impacted by this though,
1342 especially if this cache pushes the system into swapping.
1343 A value of 0 means no limit. The smallest size of 1 byte may be
1344 used to virtually disable this cache. Defaults to 256 MiB.
1345
1346 pack.deltaCacheLimit::
1347 The maximum size of a delta, that is cached in
1348 linkgit:git-pack-objects[1]. This cache is used to speed up the
1349 writing object phase by not having to recompute the final delta
1350 result once the best match for all objects is found. Defaults to 1000.
1351
1352 pack.threads::
1353 Specifies the number of threads to spawn when searching for best
1354 delta matches. This requires that linkgit:git-pack-objects[1]
1355 be compiled with pthreads otherwise this option is ignored with a
1356 warning. This is meant to reduce packing time on multiprocessor
1357 machines. The required amount of memory for the delta search window
1358 is however multiplied by the number of threads.
1359 Specifying 0 will cause git to auto-detect the number of CPU's
1360 and set the number of threads accordingly.
1361
1362 pack.indexVersion::
1363 Specify the default pack index version. Valid values are 1 for
1364 legacy pack index used by Git versions prior to 1.5.2, and 2 for
1365 the new pack index with capabilities for packs larger than 4 GB
1366 as well as proper protection against the repacking of corrupted
1367 packs. Version 2 is the default. Note that version 2 is enforced
1368 and this config option ignored whenever the corresponding pack is
1369 larger than 2 GB.
1370 +
1371 If you have an old git that does not understand the version 2 `{asterisk}.idx` file,
1372 cloning or fetching over a non native protocol (e.g. "http" and "rsync")
1373 that will copy both `{asterisk}.pack` file and corresponding `{asterisk}.idx` file from the
1374 other side may give you a repository that cannot be accessed with your
1375 older version of git. If the `{asterisk}.pack` file is smaller than 2 GB, however,
1376 you can use linkgit:git-index-pack[1] on the *.pack file to regenerate
1377 the `{asterisk}.idx` file.
1378
1379 pack.packSizeLimit::
1380 The maximum size of a pack. This setting only affects
1381 packing to a file when repacking, i.e. the git:// protocol
1382 is unaffected. It can be overridden by the `\--max-pack-size`
1383 option of linkgit:git-repack[1]. The minimum size allowed is
1384 limited to 1 MiB. The default is unlimited.
1385 Common unit suffixes of 'k', 'm', or 'g' are
1386 supported.
1387
1388 pager.<cmd>::
1389 Allows turning on or off pagination of the output of a
1390 particular git subcommand when writing to a tty. If
1391 `\--paginate` or `\--no-pager` is specified on the command line,
1392 it takes precedence over this option. To disable pagination for
1393 all commands, set `core.pager` or `GIT_PAGER` to `cat`.
1394
1395 pull.octopus::
1396 The default merge strategy to use when pulling multiple branches
1397 at once.
1398
1399 pull.twohead::
1400 The default merge strategy to use when pulling a single branch.
1401
1402 push.default::
1403 Defines the action git push should take if no refspec is given
1404 on the command line, no refspec is configured in the remote, and
1405 no refspec is implied by any of the options given on the command
1406 line. Possible values are:
1407 +
1408 * `nothing` do not push anything.
1409 * `matching` push all matching branches.
1410 All branches having the same name in both ends are considered to be
1411 matching. This is the default.
1412 * `tracking` push the current branch to its upstream branch.
1413 * `current` push the current branch to a branch of the same name.
1414
1415 rebase.stat::
1416 Whether to show a diffstat of what changed upstream since the last
1417 rebase. False by default.
1418
1419 receive.autogc::
1420 By default, git-receive-pack will run "git-gc --auto" after
1421 receiving data from git-push and updating refs. You can stop
1422 it by setting this variable to false.
1423
1424 receive.fsckObjects::
1425 If it is set to true, git-receive-pack will check all received
1426 objects. It will abort in the case of a malformed object or a
1427 broken link. The result of an abort are only dangling objects.
1428 Defaults to false.
1429
1430 receive.unpackLimit::
1431 If the number of objects received in a push is below this
1432 limit then the objects will be unpacked into loose object
1433 files. However if the number of received objects equals or
1434 exceeds this limit then the received pack will be stored as
1435 a pack, after adding any missing delta bases. Storing the
1436 pack from a push can make the push operation complete faster,
1437 especially on slow filesystems. If not set, the value of
1438 `transfer.unpackLimit` is used instead.
1439
1440 receive.denyDeletes::
1441 If set to true, git-receive-pack will deny a ref update that deletes
1442 the ref. Use this to prevent such a ref deletion via a push.
1443
1444 receive.denyCurrentBranch::
1445 If set to true or "refuse", receive-pack will deny a ref update
1446 to the currently checked out branch of a non-bare repository.
1447 Such a push is potentially dangerous because it brings the HEAD
1448 out of sync with the index and working tree. If set to "warn",
1449 print a warning of such a push to stderr, but allow the push to
1450 proceed. If set to false or "ignore", allow such pushes with no
1451 message. Defaults to "warn".
1452
1453 receive.denyNonFastForwards::
1454 If set to true, git-receive-pack will deny a ref update which is
1455 not a fast-forward. Use this to prevent such an update via a push,
1456 even if that push is forced. This configuration variable is
1457 set when initializing a shared repository.
1458
1459 receive.updateserverinfo::
1460 If set to true, git-receive-pack will run git-update-server-info
1461 after receiving data from git-push and updating refs.
1462
1463 remote.<name>.url::
1464 The URL of a remote repository. See linkgit:git-fetch[1] or
1465 linkgit:git-push[1].
1466
1467 remote.<name>.pushurl::
1468 The push URL of a remote repository. See linkgit:git-push[1].
1469
1470 remote.<name>.proxy::
1471 For remotes that require curl (http, https and ftp), the URL to
1472 the proxy to use for that remote. Set to the empty string to
1473 disable proxying for that remote.
1474
1475 remote.<name>.fetch::
1476 The default set of "refspec" for linkgit:git-fetch[1]. See
1477 linkgit:git-fetch[1].
1478
1479 remote.<name>.push::
1480 The default set of "refspec" for linkgit:git-push[1]. See
1481 linkgit:git-push[1].
1482
1483 remote.<name>.mirror::
1484 If true, pushing to this remote will automatically behave
1485 as if the `\--mirror` option was given on the command line.
1486
1487 remote.<name>.skipDefaultUpdate::
1488 If true, this remote will be skipped by default when updating
1489 using linkgit:git-fetch[1] or the `update` subcommand of
1490 linkgit:git-remote[1].
1491
1492 remote.<name>.skipFetchAll::
1493 If true, this remote will be skipped by default when updating
1494 using linkgit:git-fetch[1] or the `update` subcommand of
1495 linkgit:git-remote[1].
1496
1497 remote.<name>.receivepack::
1498 The default program to execute on the remote side when pushing. See
1499 option \--receive-pack of linkgit:git-push[1].
1500
1501 remote.<name>.uploadpack::
1502 The default program to execute on the remote side when fetching. See
1503 option \--upload-pack of linkgit:git-fetch-pack[1].
1504
1505 remote.<name>.tagopt::
1506 Setting this value to \--no-tags disables automatic tag following when
1507 fetching from remote <name>
1508
1509 remote.<name>.vcs::
1510 Setting this to a value <vcs> will cause git to interact with
1511 the remote with the git-remote-<vcs> helper.
1512
1513 remotes.<group>::
1514 The list of remotes which are fetched by "git remote update
1515 <group>". See linkgit:git-remote[1].
1516
1517 repack.usedeltabaseoffset::
1518 By default, linkgit:git-repack[1] creates packs that use
1519 delta-base offset. If you need to share your repository with
1520 git older than version 1.4.4, either directly or via a dumb
1521 protocol such as http, then you need to set this option to
1522 "false" and repack. Access from old git versions over the
1523 native protocol are unaffected by this option.
1524
1525 rerere.autoupdate::
1526 When set to true, `git-rerere` updates the index with the
1527 resulting contents after it cleanly resolves conflicts using
1528 previously recorded resolution. Defaults to false.
1529
1530 rerere.enabled::
1531 Activate recording of resolved conflicts, so that identical
1532 conflict hunks can be resolved automatically, should they
1533 be encountered again. linkgit:git-rerere[1] command is by
1534 default enabled if you create `rr-cache` directory under
1535 `$GIT_DIR`, but can be disabled by setting this option to false.
1536
1537 sendemail.identity::
1538 A configuration identity. When given, causes values in the
1539 'sendemail.<identity>' subsection to take precedence over
1540 values in the 'sendemail' section. The default identity is
1541 the value of 'sendemail.identity'.
1542
1543 sendemail.smtpencryption::
1544 See linkgit:git-send-email[1] for description. Note that this
1545 setting is not subject to the 'identity' mechanism.
1546
1547 sendemail.smtpssl::
1548 Deprecated alias for 'sendemail.smtpencryption = ssl'.
1549
1550 sendemail.<identity>.*::
1551 Identity-specific versions of the 'sendemail.*' parameters
1552 found below, taking precedence over those when the this
1553 identity is selected, through command-line or
1554 'sendemail.identity'.
1555
1556 sendemail.aliasesfile::
1557 sendemail.aliasfiletype::
1558 sendemail.bcc::
1559 sendemail.cc::
1560 sendemail.cccmd::
1561 sendemail.chainreplyto::
1562 sendemail.confirm::
1563 sendemail.envelopesender::
1564 sendemail.from::
1565 sendemail.multiedit::
1566 sendemail.signedoffbycc::
1567 sendemail.smtppass::
1568 sendemail.suppresscc::
1569 sendemail.suppressfrom::
1570 sendemail.to::
1571 sendemail.smtpserver::
1572 sendemail.smtpserverport::
1573 sendemail.smtpuser::
1574 sendemail.thread::
1575 sendemail.validate::
1576 See linkgit:git-send-email[1] for description.
1577
1578 sendemail.signedoffcc::
1579 Deprecated alias for 'sendemail.signedoffbycc'.
1580
1581 showbranch.default::
1582 The default set of branches for linkgit:git-show-branch[1].
1583 See linkgit:git-show-branch[1].
1584
1585 status.relativePaths::
1586 By default, linkgit:git-status[1] shows paths relative to the
1587 current directory. Setting this variable to `false` shows paths
1588 relative to the repository root (this was the default for git
1589 prior to v1.5.4).
1590
1591 status.showUntrackedFiles::
1592 By default, linkgit:git-status[1] and linkgit:git-commit[1] show
1593 files which are not currently tracked by Git. Directories which
1594 contain only untracked files, are shown with the directory name
1595 only. Showing untracked files means that Git needs to lstat() all
1596 all the files in the whole repository, which might be slow on some
1597 systems. So, this variable controls how the commands displays
1598 the untracked files. Possible values are:
1599 +
1600 --
1601 - 'no' - Show no untracked files
1602 - 'normal' - Shows untracked files and directories
1603 - 'all' - Shows also individual files in untracked directories.
1604 --
1605 +
1606 If this variable is not specified, it defaults to 'normal'.
1607 This variable can be overridden with the -u|--untracked-files option
1608 of linkgit:git-status[1] and linkgit:git-commit[1].
1609
1610 tar.umask::
1611 This variable can be used to restrict the permission bits of
1612 tar archive entries. The default is 0002, which turns off the
1613 world write bit. The special value "user" indicates that the
1614 archiving user's umask will be used instead. See umask(2) and
1615 linkgit:git-archive[1].
1616
1617 transfer.unpackLimit::
1618 When `fetch.unpackLimit` or `receive.unpackLimit` are
1619 not set, the value of this variable is used instead.
1620 The default value is 100.
1621
1622 url.<base>.insteadOf::
1623 Any URL that starts with this value will be rewritten to
1624 start, instead, with <base>. In cases where some site serves a
1625 large number of repositories, and serves them with multiple
1626 access methods, and some users need to use different access
1627 methods, this feature allows people to specify any of the
1628 equivalent URLs and have git automatically rewrite the URL to
1629 the best alternative for the particular user, even for a
1630 never-before-seen repository on the site. When more than one
1631 insteadOf strings match a given URL, the longest match is used.
1632
1633 url.<base>.pushInsteadOf::
1634 Any URL that starts with this value will not be pushed to;
1635 instead, it will be rewritten to start with <base>, and the
1636 resulting URL will be pushed to. In cases where some site serves
1637 a large number of repositories, and serves them with multiple
1638 access methods, some of which do not allow push, this feature
1639 allows people to specify a pull-only URL and have git
1640 automatically use an appropriate URL to push, even for a
1641 never-before-seen repository on the site. When more than one
1642 pushInsteadOf strings match a given URL, the longest match is
1643 used. If a remote has an explicit pushurl, git will ignore this
1644 setting for that remote.
1645
1646 user.email::
1647 Your email address to be recorded in any newly created commits.
1648 Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
1649 'EMAIL' environment variables. See linkgit:git-commit-tree[1].
1650
1651 user.name::
1652 Your full name to be recorded in any newly created commits.
1653 Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
1654 environment variables. See linkgit:git-commit-tree[1].
1655
1656 user.signingkey::
1657 If linkgit:git-tag[1] is not selecting the key you want it to
1658 automatically when creating a signed tag, you can override the
1659 default selection with this variable. This option is passed
1660 unchanged to gpg's --local-user parameter, so you may specify a key
1661 using any method that gpg supports.
1662
1663 web.browser::
1664 Specify a web browser that may be used by some commands.
1665 Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
1666 may use it.