blob: 29559c88af2e5cc2aeffdc29626b6710446bc10f [file] [log] [blame]
Junio C Hamano07824ce2006-04-25 07:36:541CONFIGURATION FILE
2------------------
3
Junio C Hamano076ffcc2013-02-06 05:13:214The Git configuration file contains a number of variables that affect
5the Git commands' behavior. The `.git/config` file in each repository
Junio C Hamanof4581102009-04-25 08:29:596is used to store the configuration for that repository, and
7`$HOME/.gitconfig` is used to store a per-user configuration as
8fallback values for the `.git/config` file. The file `/etc/gitconfig`
9can be used to store a system-wide default configuration.
Junio C Hamano8f76dc62007-01-17 07:24:2510
Junio C Hamano076ffcc2013-02-06 05:13:2111The configuration variables are used by both the Git plumbing
Junio C Hamanof4581102009-04-25 08:29:5912and the porcelains. The variables are divided into sections, wherein
13the fully qualified variable name of the variable itself is the last
Junio C Hamano07824ce2006-04-25 07:36:5414dot-separated segment and the section name is everything before the last
Junio C Hamano81d540a2012-03-02 19:52:4715dot. The variable names are case-insensitive, allow only alphanumeric
16characters and `-`, and must start with an alphabetic character. Some
17variables may appear multiple times.
Junio C Hamano07824ce2006-04-25 07:36:5418
Junio C Hamanobee172f2007-01-23 08:44:1819Syntax
20~~~~~~
21
Junio C Hamano07824ce2006-04-25 07:36:5422The syntax is fairly flexible and permissive; whitespaces are mostly
Junio C Hamanobee172f2007-01-23 08:44:1823ignored. 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
Junio C Hamanoea82cff2009-03-18 01:54:4829characters, `-` and `.` are allowed in section names. Each variable
Junio C Hamanof4581102009-04-25 08:29:5930must belong to some section, which means that there must be a section
31header before the first setting of a variable.
Junio C Hamanobee172f2007-01-23 08:44:1832
33Sections can be further divided into subsections. To begin a subsection
34put its name in double quotes, separated by space from the section name,
Junio C Hamanof4581102009-04-25 08:29:5935in the section header, like in the example below:
Junio C Hamanobee172f2007-01-23 08:44:1836
37--------
38[section "subsection"]
39
40--------
41
Junio C Hamanof4581102009-04-25 08:29:5942Subsection 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
Junio C Hamanobee172f2007-01-23 08:44:1845lines. 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
Junio C Hamano6231f822011-10-24 05:18:5249There 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.
Junio C Hamanobee172f2007-01-23 08:44:1853
Junio C Hamanoaa2cd762009-07-26 08:14:0154All the other lines (and the remainder of the line after the section
55header) are recognized as setting variables, in the form
Junio C Hamanobee172f2007-01-23 08:44:1856'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".
Junio C Hamano81d540a2012-03-02 19:52:4758The 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.
Junio C Hamanobee172f2007-01-23 08:44:1862
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,
Junio C Hamano059bca52011-03-30 22:47:46681/0, true/false or on/off. Case is not significant in boolean values, when
Junio C Hamanobee172f2007-01-23 08:44:1869converting value to the canonical form using '--bool' type specifier;
Junio C Hamano1aa40d22010-01-21 17:46:4370'git config' will ensure that the output is "true" or "false".
Junio C Hamanobee172f2007-01-23 08:44:1871
72String values may be entirely or partially enclosed in double quotes.
Junio C Hamanof4581102009-04-25 08:29:5973You 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
Junio C Hamanoea82cff2009-03-18 01:54:4877be escaped: use `\"` for `"` and `\\` for `\`.
Junio C Hamanobee172f2007-01-23 08:44:1878
Junio C Hamanoea82cff2009-03-18 01:54:4879The 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
Junio C Hamanobee172f2007-01-23 08:44:1882char sequences are valid.
83
Junio C Hamanof4581102009-04-25 08:29:5984Variable values ending in a `\` are continued on the next line in the
Junio C Hamanobee172f2007-01-23 08:44:1885customary UNIX fashion.
86
Junio C Hamanof4581102009-04-25 08:29:5987Some variables may require a special value format.
Junio C Hamano07824ce2006-04-25 07:36:5488
Junio C Hamanoe0238c22012-02-23 22:45:5089Includes
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
Junio C Hamano22700fb2012-05-03 23:07:2598found. The value of `include.path` is subject to tilde expansion: `~/`
99is expanded to the value of `$HOME`, and `~user/` to the specified
Junio C Hamano4d61c4a2012-04-30 01:10:22100user's home directory. See below for examples.
Junio C Hamanoe0238c22012-02-23 22:45:50101
Junio C Hamano07824ce2006-04-25 07:36:54102Example
103~~~~~~~
104
105# Core variables
106[core]
107; Don't trust file modes
108filemode = false
109
110# Our diff algorithm
111[diff]
Junio C Hamano85c71572008-07-28 00:03:31112external = /usr/local/bin/diff-wrapper
Junio C Hamano07824ce2006-04-25 07:36:54113renames = true
114
Junio C Hamano52401ef2006-12-19 00:54:38115[branch "devel"]
116remote = origin
117merge = refs/heads/devel
118
Junio C Hamanobee172f2007-01-23 08:44:18119# Proxy settings
120[core]
Junio C Hamanoc71a8732007-08-04 00:27:26121gitProxy="ssh" for "kernel.org"
Junio C Hamanobee172f2007-01-23 08:44:18122gitProxy=default-proxy ; for the rest
Junio C Hamano52401ef2006-12-19 00:54:38123
Junio C Hamanoe0238c22012-02-23 22:45:50124[include]
125path = /path/to/foo.inc ; include by absolute path
126path = foo ; expand "foo" relative to the current file
Junio C Hamano4d61c4a2012-04-30 01:10:22127path = ~/foo ; expand "foo" in your $HOME directory
Junio C Hamanoe0238c22012-02-23 22:45:50128
Junio C Hamano07824ce2006-04-25 07:36:54129Variables
130~~~~~~~~~
131
132Note that this list is non-comprehensive and not necessarily complete.
Junio C Hamanof1d14802006-06-08 00:48:17133For command-specific variables, you will find a more detailed description
134in the appropriate manual page. You will find a description of non-core
Junio C Hamano07824ce2006-04-25 07:36:54135porcelain configuration variables in the respective porcelain documentation.
136
Junio C Hamano7df6dcf2009-09-13 09:51:17137advice.*::
Junio C Hamano0df92712011-12-21 22:30:44138These variables control various optional help messages designed to
139aid new users. All 'advice.*' variables default to 'true', and you
140can tell Git that you do not need help by setting these to 'false':
Junio C Hamano7df6dcf2009-09-13 09:51:17141+
142--
Junio C Hamanoabad6da2013-01-06 09:06:32143pushUpdateRejected::
Junio C Hamano0c1b64e2012-04-20 23:50:49144Set this variable to 'false' if you want to disable
Junio C Hamanoabad6da2013-01-06 09:06:32145'pushNonFFCurrent', 'pushNonFFDefault',
Junio C Hamano3f2ed6f2013-02-04 19:24:09146'pushNonFFMatching', 'pushAlreadyExists',
147'pushFetchFirst', and 'pushNeedsForce'
Junio C Hamanoabad6da2013-01-06 09:06:32148simultaneously.
Junio C Hamano0c1b64e2012-04-20 23:50:49149pushNonFFCurrent::
150Advice shown when linkgit:git-push[1] fails due to a
151non-fast-forward update to the current branch.
152pushNonFFDefault::
153Advice to set 'push.default' to 'upstream' or 'current'
154when you ran linkgit:git-push[1] and pushed 'matching
155refs' by default (i.e. you did not provide an explicit
156refspec, and no 'push.default' configuration was set)
157and it resulted in a non-fast-forward error.
158pushNonFFMatching::
159Advice shown when you ran linkgit:git-push[1] and pushed
160'matching refs' explicitly (i.e. you used ':', or
161specified a refspec that isn't your current branch) and
162it resulted in a non-fast-forward error.
Junio C Hamanoabad6da2013-01-06 09:06:32163pushAlreadyExists::
164Shown when linkgit:git-push[1] rejects an update that
165does not qualify for fast-forwarding (e.g., a tag.)
Junio C Hamano3f2ed6f2013-02-04 19:24:09166pushFetchFirst::
167Shown when linkgit:git-push[1] rejects an update that
168tries to overwrite a remote ref that points at an
169object we do not have.
170pushNeedsForce::
171Shown when linkgit:git-push[1] rejects an update that
172tries to overwrite a remote ref that points at an
173object that is not a committish, or make the remote
174ref point at an object that is not a committish.
Junio C Hamano7df6dcf2009-09-13 09:51:17175statusHints::
Junio C Hamano644936c2012-06-28 23:05:14176Show directions on how to proceed from the current
Junio C Hamano917cd4f2012-12-04 23:41:10177state in the output of linkgit:git-status[1], in
Junio C Hamano644936c2012-06-28 23:05:14178the template shown when writing commit messages in
Junio C Hamano917cd4f2012-12-04 23:41:10179linkgit:git-commit[1], and in the help message shown
180by linkgit:git-checkout[1] when switching branch.
Junio C Hamano5e7f1312013-03-21 22:49:01181statusUoption::
182Advise to consider using the `-u` option to linkgit:git-status[1]
183when the command takes more than 2 seconds to enumerate untracked
184files.
Junio C Hamano5706e0b2009-11-24 10:54:16185commitBeforeMerge::
186Advice shown when linkgit:git-merge[1] refuses to
Junio C Hamano619596a2010-08-18 22:15:35187merge to avoid overwriting local changes.
Junio C Hamanoa9701f02010-01-21 00:42:16188resolveConflict::
Junio C Hamano5dab5a92013-02-25 18:51:24189Advice shown by various commands when conflicts
Junio C Hamanoa9701f02010-01-21 00:42:16190prevent the operation from being performed.
Junio C Hamanoa9701f02010-01-21 00:42:16191implicitIdentity::
192Advice on how to set your identity configuration when
193your information is guessed from the system username and
Junio C Hamano0df92712011-12-21 22:30:44194domain name.
Junio C Hamano74a198f2010-02-22 00:13:31195detachedHead::
Junio C Hamano0df92712011-12-21 22:30:44196Advice shown when you used linkgit:git-checkout[1] to
Junio C Hamano74a198f2010-02-22 00:13:31197move to the detach HEAD state, to instruct how to create
Junio C Hamano0df92712011-12-21 22:30:44198a local branch after the fact.
Junio C Hamanobb300642012-07-22 21:09:14199amWorkDir::
200Advice that shows the location of the patch file when
201linkgit:git-am[1] fails to apply it.
Junio C Hamano7df6dcf2009-09-13 09:51:17202--
203
Junio C Hamano07824ce2006-04-25 07:36:54204core.fileMode::
205If false, the executable bit differences between the index and
Junio C Hamano8fb66e52011-10-05 20:59:51206the working tree are ignored; useful on broken filesystems like FAT.
Junio C Hamano9df0c662009-11-23 11:09:27207See linkgit:git-update-index[1].
208+
209The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
210will probe and set core.fileMode false if appropriate when the
211repository is created.
Junio C Hamano07824ce2006-04-25 07:36:54212
Junio C Hamanoa476efa2008-10-10 15:31:42213core.ignoreCygwinFSTricks::
214This option is only used by Cygwin implementation of Git. If false,
215the Cygwin stat() and lstat() functions are used. This may be useful
216if your repository consists of a few separate directories joined in
217one hierarchy using Cygwin mount. If true, Git uses native Win32 API
218whenever it is possible and falls back to Cygwin functions only to
219handle symbol links. The native mode is more than twice faster than
Junio C Hamano7d06a8a2008-10-20 05:42:33220normal Cygwin l/stat() functions. True by default, unless core.filemode
221is true, in which case ignoreCygwinFSTricks is ignored as Cygwin's
222POSIX emulation is required to support core.filemode.
Junio C Hamanoa476efa2008-10-10 15:31:42223
Junio C Hamano9df0c662009-11-23 11:09:27224core.ignorecase::
225If true, this option enables various workarounds to enable
Junio C Hamano076ffcc2013-02-06 05:13:21226Git to work better on filesystems that are not case sensitive,
Junio C Hamano9df0c662009-11-23 11:09:27227like FAT. For example, if a directory listing finds
Junio C Hamano076ffcc2013-02-06 05:13:21228"makefile" when Git expects "Makefile", Git will assume
Junio C Hamano9df0c662009-11-23 11:09:27229it is really the same file, and continue to remember it as
230"Makefile".
231+
232The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]
233will probe and set core.ignorecase true if appropriate when the repository
234is created.
235
Junio C Hamanob61a7772012-07-13 23:34:48236core.precomposeunicode::
Junio C Hamano076ffcc2013-02-06 05:13:21237This option is only used by Mac OS implementation of Git.
238When core.precomposeunicode=true, Git reverts the unicode decomposition
Junio C Hamanob61a7772012-07-13 23:34:48239of filenames done by Mac OS. This is useful when sharing a repository
240between Mac OS and Linux or Windows.
Junio C Hamano076ffcc2013-02-06 05:13:21241(Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7).
242When false, file names are handled fully transparent by Git,
243which is backward compatible with older versions of Git.
Junio C Hamanob61a7772012-07-13 23:34:48244
Junio C Hamano90ccff32008-07-29 08:17:24245core.trustctime::
246If false, the ctime differences between the index and the
Junio C Hamano8fb66e52011-10-05 20:59:51247working tree are ignored; useful when the inode change time
Junio C Hamano90ccff32008-07-29 08:17:24248is regularly modified by something outside Git (file system
249crawlers and some backup systems).
250See linkgit:git-update-index[1]. True by default.
251
Junio C Hamano4cfed0c2013-01-30 17:58:54252core.checkstat::
253Determines which stat fields to match between the index
254and work tree. The user can set this to 'default' or
255'minimal'. Default (or explicitly 'default'), is to check
256all fields, including the sub-second part of mtime and ctime.
257
Junio C Hamanod526ba92007-07-02 00:17:42258core.quotepath::
Junio C Hamanoba4b9282008-07-06 05:20:31259The commands that output paths (e.g. 'ls-files',
260'diff'), when not given the `-z` option, will quote
Junio C Hamanod526ba92007-07-02 00:17:42261"unusual" characters in the pathname by enclosing the
262pathname in a double-quote pair and with backslashes the
263same way strings in C source code are quoted. If this
264variable is set to false, the bytes higher than 0x80 are
265not quoted but output as verbatim. Note that double
266quote, backslash and control characters are always
267quoted without `-z` regardless of the setting of this
268variable.
269
Junio C Hamanobb88cf42010-06-21 15:23:55270core.eol::
271Sets the line ending type to use in the working directory for
272files that have the `text` property set. Alternatives are
273'lf', 'crlf' and 'native', which uses the platform's native
274line ending. The default value is `native`. See
275linkgit:gitattributes[5] for more information on end-of-line
276conversion.
Junio C Hamanod9e0e5d2007-04-14 16:22:04277
Junio C Hamano26e590a2008-02-17 03:53:51278core.safecrlf::
Junio C Hamano076ffcc2013-02-06 05:13:21279If true, makes Git check if converting `CRLF` is reversible when
Junio C Hamanobb88cf42010-06-21 15:23:55280end-of-line conversion is active. Git will verify if a command
Junio C Hamano26e590a2008-02-17 03:53:51281modifies a file in the work tree either directly or indirectly.
282For example, committing a file followed by checking out the
283same file should yield the original file in the work tree. If
284this is not the case for the current setting of
Junio C Hamano076ffcc2013-02-06 05:13:21285`core.autocrlf`, Git will reject the file. The variable can
286be set to "warn", in which case Git will only warn about an
Junio C Hamano26e590a2008-02-17 03:53:51287irreversible conversion but continue the operation.
288+
289CRLF conversion bears a slight chance of corrupting data.
Junio C Hamano076ffcc2013-02-06 05:13:21290When it is enabled, Git will convert CRLF to LF during commit and LF to
Junio C Hamano26e590a2008-02-17 03:53:51291CRLF during checkout. A file that contains a mixture of LF and
Junio C Hamano076ffcc2013-02-06 05:13:21292CRLF before the commit cannot be recreated by Git. For text
Junio C Hamano26e590a2008-02-17 03:53:51293files this is the right thing to do: it corrects line endings
294such that we have only LF line endings in the repository.
295But for binary files that are accidentally classified as text the
296conversion can corrupt data.
297+
298If you recognize such corruption early you can easily fix it by
299setting the conversion type explicitly in .gitattributes. Right
300after committing you still have the original file in your work
301tree and this file is not yet corrupted. You can explicitly tell
Junio C Hamano076ffcc2013-02-06 05:13:21302Git that this file is binary and Git will handle the file
Junio C Hamano26e590a2008-02-17 03:53:51303appropriately.
304+
305Unfortunately, the desired effect of cleaning up text files with
306mixed line endings and the undesired effect of corrupting binary
307files cannot be distinguished. In both cases CRLFs are removed
308in an irreversible way. For text files this is the right thing
309to do because CRLFs are line endings, while for binary files
310converting CRLFs corrupts data.
311+
312Note, this safety check does not mean that a checkout will generate a
313file identical to the original file for a different setting of
Junio C Hamanobb88cf42010-06-21 15:23:55314`core.eol` and `core.autocrlf`, but only for the current one. For
315example, a text file with `LF` would be accepted with `core.eol=lf`
316and could later be checked out with `core.eol=crlf`, in which case the
Junio C Hamano26e590a2008-02-17 03:53:51317resulting file would contain `CRLF`, although the original file
318contained `LF`. However, in both work trees the line endings would be
319consistent, that is either all `LF` or all `CRLF`, but never mixed. A
320file with mixed line endings would be reported by the `core.safecrlf`
321mechanism.
322
Junio C Hamanobb88cf42010-06-21 15:23:55323core.autocrlf::
324Setting this variable to "true" is almost the same as setting
325the `text` attribute to "auto" on all files except that text
326files are not guaranteed to be normalized: files that contain
327`CRLF` in the repository will not be touched. Use this
328setting if you want to have `CRLF` line endings in your
329working directory even though the repository does not have
330normalized line endings. This variable can be set to 'input',
331in which case no output conversion is performed.
332
Junio C Hamanoaa83a7d2007-03-05 02:37:29333core.symlinks::
334If false, symbolic links are checked out as small plain files that
Junio C Hamano35738e82008-01-07 07:55:46335contain the link text. linkgit:git-update-index[1] and
336linkgit:git-add[1] will not change the recorded type to regular
Junio C Hamanoaa83a7d2007-03-05 02:37:29337file. Useful on filesystems like FAT that do not support
Junio C Hamano9df0c662009-11-23 11:09:27338symbolic links.
339+
340The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
341will probe and set core.symlinks false if appropriate when the repository
342is created.
Junio C Hamanoaa83a7d2007-03-05 02:37:29343
Junio C Hamano07824ce2006-04-25 07:36:54344core.gitProxy::
345A "proxy command" to execute (as 'command host port') instead
346of establishing direct connection to the remote server when
Junio C Hamano076ffcc2013-02-06 05:13:21347using the Git protocol for fetching. If the variable value is
Junio C Hamano07824ce2006-04-25 07:36:54348in the "COMMAND for DOMAIN" format, the command is applied only
349on hostnames ending with the specified domain string. This variable
350may be set multiple times and is matched in the given order;
351the first match wins.
Junio C Hamanof1d14802006-06-08 00:48:17352+
353Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
354(which always applies universally, without the special "for"
355handling).
Junio C Hamanoea82cff2009-03-18 01:54:48356+
357The special string `none` can be used as the proxy command to
358specify that no proxy be used for a given domain pattern.
359This is useful for excluding servers inside a firewall from
360proxy use, while defaulting to a common proxy for external domains.
Junio C Hamano07824ce2006-04-25 07:36:54361
362core.ignoreStat::
Junio C Hamano054ea082008-06-01 08:26:34363If true, commands which modify both the working tree and the index
364will mark the updated paths with the "assume unchanged" bit in the
365index. These marked files are then assumed to stay unchanged in the
Junio C Hamano8fb66e52011-10-05 20:59:51366working tree, until you mark them otherwise manually - Git will not
Junio C Hamano054ea082008-06-01 08:26:34367detect the file changes by lstat() calls. This is useful on systems
368where those are very slow, such as Microsoft Windows.
369See linkgit:git-update-index[1].
Junio C Hamano07824ce2006-04-25 07:36:54370False by default.
371
Junio C Hamano88a3a072006-05-04 08:01:43372core.preferSymlinkRefs::
373Instead of the default "symref" format for HEAD
374and other symbolic reference files, use symbolic links.
375This is sometimes needed to work with old scripts that
376expect HEAD to be a symbolic link.
Junio C Hamano07824ce2006-04-25 07:36:54377
Junio C Hamano1025e752007-02-23 07:21:26378core.bare::
379If true this repository is assumed to be 'bare' and has no
380working directory associated with it. If this is the case a
381number of commands that require a working directory will be
Junio C Hamano35738e82008-01-07 07:55:46382disabled, such as linkgit:git-add[1] or linkgit:git-merge[1].
Junio C Hamano1025e752007-02-23 07:21:26383+
Junio C Hamano35738e82008-01-07 07:55:46384This setting is automatically guessed by linkgit:git-clone[1] or
385linkgit:git-init[1] when the repository was created. By default a
Junio C Hamano1025e752007-02-23 07:21:26386repository that ends in "/.git" is assumed to be not bare (bare =
387false), while all other repositories are assumed to be bare (bare
388= true).
389
Junio C Hamanod526ba92007-07-02 00:17:42390core.worktree::
Junio C Hamano80d58462011-01-24 22:52:52391Set the path to the root of the working tree.
Junio C Hamano764a6672007-10-23 01:23:31392This can be overridden by the GIT_WORK_TREE environment
Junio C Hamano80d58462011-01-24 22:52:52393variable and the '--work-tree' command line option.
Junio C Hamano5cd15182011-04-05 00:21:10394The value can be an absolute path or relative to the path to
Junio C Hamano80d58462011-01-24 22:52:52395the .git directory, which is either specified by --git-dir
396or GIT_DIR, or automatically discovered.
397If --git-dir or GIT_DIR is specified but none of
Junio C Hamano7d575a52008-04-30 08:45:27398--work-tree, GIT_WORK_TREE and core.worktree is specified,
Junio C Hamano80d58462011-01-24 22:52:52399the current working directory is regarded as the top level
Junio C Hamano3609b332010-12-29 01:34:52400of your working tree.
Junio C Hamano80d58462011-01-24 22:52:52401+
402Note that this variable is honored even when set in a configuration
403file in a ".git" subdirectory of a directory and its value differs
404from the latter directory (e.g. "/path/to/.git/config" has
405core.worktree set to "/different/path"), which is most likely a
Junio C Hamano076ffcc2013-02-06 05:13:21406misconfiguration. Running Git commands in the "/path/to" directory will
Junio C Hamano80d58462011-01-24 22:52:52407still use "/different/path" as the root of the work tree and can cause
408confusion unless you know what you are doing (e.g. you are creating a
409read-only snapshot of the same index to a location different from the
410repository's usual working tree).
Junio C Hamanod526ba92007-07-02 00:17:42411
Junio C Hamano341071d2006-06-04 07:24:48412core.logAllRefUpdates::
Junio C Hamanocae86272007-08-21 02:20:49413Enable the reflog. Updates to a ref <ref> is logged to the file
Junio C Hamanoa2ec14f2006-11-02 00:22:48414"$GIT_DIR/logs/<ref>", by appending the new and old
415SHA1, the date/time and the reason of the update, but
416only when the file exists. If this configuration
417variable is set to true, missing "$GIT_DIR/logs/<ref>"
Junio C Hamano15567bc2011-07-23 00:51:59418file is automatically created for branch heads (i.e. under
419refs/heads/), remote refs (i.e. under refs/remotes/),
420note refs (i.e. under refs/notes/), and the symbolic ref HEAD.
Junio C Hamano1caaf472006-12-31 08:29:35421+
422This information can be used to determine what commit
423was the tip of a branch "2 days ago".
424+
425This value is true by default in a repository that has
426a working directory associated with it, and false by
427default in a bare repository.
Junio C Hamano341071d2006-06-04 07:24:48428
Junio C Hamano07824ce2006-04-25 07:36:54429core.repositoryFormatVersion::
430Internal variable identifying the repository format and layout
431version.
432
433core.sharedRepository::
Junio C Hamano0ab78ae2006-08-09 01:00:42434When 'group' (or 'true'), the repository is made shareable between
435several users in a group (making sure all the files and objects are
436group-writable). When 'all' (or 'world' or 'everybody'), the
437repository will be readable by all users, additionally to being
Junio C Hamano076ffcc2013-02-06 05:13:21438group-shareable. When 'umask' (or 'false'), Git will use permissions
Junio C Hamano2f102bb2008-04-26 02:23:37439reported by umask(2). When '0xxx', where '0xxx' is an octal number,
440files in the repository will have this mode value. '0xxx' will override
Junio C Hamano83eded12009-04-20 08:18:00441user's umask value (whereas the other options will only override
442requested parts of the user's umask value). Examples: '0660' will make
443the repo read/write-able for the owner and group, but inaccessible to
444others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a
Junio C Hamano2f102bb2008-04-26 02:23:37445repository that is group-readable but not group-writable.
446See linkgit:git-init[1]. False by default.
Junio C Hamano07824ce2006-04-25 07:36:54447
448core.warnAmbiguousRefs::
Junio C Hamano076ffcc2013-02-06 05:13:21449If true, Git will warn you if the ref name you passed it is ambiguous
Junio C Hamano947ab822013-03-19 23:07:29450and might match multiple refs in the repository. True by default.
Junio C Hamano07824ce2006-04-25 07:36:54451
Junio C Hamano7ec15722006-07-07 02:03:59452core.compression::
Junio C Hamanof2ce2972007-05-20 19:12:09453An integer -1..9, indicating a default compression level.
454-1 is the zlib default. 0 means no compression,
455and 1..9 are various speed/size tradeoffs, 9 being slowest.
Junio C Hamano2e72a942007-11-21 08:54:42456If set, this provides a default to other compression variables,
457such as 'core.loosecompression' and 'pack.compression'.
Junio C Hamanoa126a3b2006-07-04 04:55:26458
Junio C Hamanof2ce2972007-05-20 19:12:09459core.loosecompression::
460An integer -1..9, indicating the compression level for objects that
461are not in a pack file. -1 is the zlib default. 0 means no
462compression, and 1..9 are various speed/size tradeoffs, 9 being
463slowest. If not set, defaults to core.compression. If that is
Junio C Hamano2e72a942007-11-21 08:54:42464not set, defaults to 1 (best speed).
Junio C Hamano28d9dfe2006-07-25 03:50:49465
Junio C Hamanofc4d38c2007-01-08 06:53:32466core.packedGitWindowSize::
467Number of bytes of a pack file to map into memory in a
468single mapping operation. Larger window sizes may allow
469your system to process a smaller number of large pack files
470more quickly. Smaller window sizes will negatively affect
471performance due to increased calls to the operating system's
472memory manager, but may improve performance when accessing
473a large number of large pack files.
474+
475Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32
476MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should
477be reasonable for all users/operating systems. You probably do
478not need to adjust this value.
479+
480Common unit suffixes of 'k', 'm', or 'g' are supported.
481
482core.packedGitLimit::
483Maximum number of bytes to map simultaneously into memory
484from pack files. If Git needs to access more than this many
485bytes at once to complete an operation it will unmap existing
486regions to reclaim virtual address space within the process.
487+
488Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms.
489This should be reasonable for all users/operating systems, except on
490the largest projects. You probably do not need to adjust this value.
491+
492Common unit suffixes of 'k', 'm', or 'g' are supported.
493
Junio C Hamanob8c51282007-03-19 10:43:30494core.deltaBaseCacheLimit::
495Maximum number of bytes to reserve for caching base objects
Junio C Hamano619596a2010-08-18 22:15:35496that may be referenced by multiple deltified objects. By storing the
Junio C Hamanob8c51282007-03-19 10:43:30497entire decompressed base objects in a cache Git is able
498to avoid unpacking and decompressing frequently used base
499objects multiple times.
500+
501Default is 16 MiB on all platforms. This should be reasonable
502for all users/operating systems, except on the largest projects.
503You probably do not need to adjust this value.
504+
505Common unit suffixes of 'k', 'm', or 'g' are supported.
506
Junio C Hamano5c246f22010-02-03 07:34:53507core.bigFileThreshold::
508Files larger than this size are stored deflated, without
509attempting delta compression. Storing large files without
510delta compression avoids excessive memory usage, at the
511slight expense of increased disk usage.
512+
513Default is 512 MiB on all platforms. This should be reasonable
514for most projects as source code and other text files can still
515be delta compressed, but larger binary media files won't be.
516+
517Common unit suffixes of 'k', 'm', or 'g' are supported.
Junio C Hamano5c246f22010-02-03 07:34:53518
Junio C Hamano1d90cb02007-07-03 07:05:31519core.excludesfile::
Junio C Hamano5e284b42007-05-22 07:23:37520In addition to '.gitignore' (per-directory) and
Junio C Hamano076ffcc2013-02-06 05:13:21521'.git/info/exclude', Git looks into this file for patterns
Junio C Hamanob76a6862012-05-02 22:02:46522of files which are not meant to be tracked. "`~/`" is expanded
523to the value of `$HOME` and "`~user/`" to the specified user's
Junio C Hamano8edb4c72012-07-09 20:33:55524home directory. Its default value is $XDG_CONFIG_HOME/git/ignore.
525If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore
526is used instead. See linkgit:gitignore[5].
Junio C Hamano5e284b42007-05-22 07:23:37527
Junio C Hamano3fd7b262010-09-08 22:44:20528core.askpass::
529Some commands (e.g. svn and http interfaces) that interactively
530ask for a password can be told to use an external program given
531via the value of this variable. Can be overridden by the 'GIT_ASKPASS'
532environment variable. If not set, fall back to the value of the
533'SSH_ASKPASS' environment variable or, failing that, a simple password
534prompt. The external program shall be given a suitable prompt as
535command line argument and write the password on its STDOUT.
536
Junio C Hamano3b4609d2010-09-30 00:04:34537core.attributesfile::
538In addition to '.gitattributes' (per-directory) and
Junio C Hamano076ffcc2013-02-06 05:13:21539'.git/info/attributes', Git looks into this file for attributes
Junio C Hamano3b4609d2010-09-30 00:04:34540(see linkgit:gitattributes[5]). Path expansions are made the same
Junio C Hamano8edb4c72012-07-09 20:33:55541way as for `core.excludesfile`. Its default value is
542$XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not
543set or empty, $HOME/.config/git/attributes is used instead.
Junio C Hamano3b4609d2010-09-30 00:04:34544
Junio C Hamanof6002a92007-07-20 10:28:22545core.editor::
546Commands such as `commit` and `tag` that lets you edit
Junio C Hamanoa6387422007-08-25 03:54:27547messages by launching an editor uses the value of this
Junio C Hamanof6002a92007-07-20 10:28:22548variable when it is set, and the environment variable
Junio C Hamano3b70d3c2009-11-21 17:37:37549`GIT_EDITOR` is not set. See linkgit:git-var[1].
Junio C Hamanof6002a92007-07-20 10:28:22550
Junio C Hamano3f2ed6f2013-02-04 19:24:09551core.commentchar::
552Commands such as `commit` and `tag` that lets you edit
553messages consider a line that begins with this character
554commented, and removes them after the editor returns
555(default '#').
556
Junio C Hamano6231f822011-10-24 05:18:52557sequence.editor::
Junio C Hamano778a3412013-03-28 23:24:30558Text editor used by `git rebase -i` for editing the rebase instruction file.
Junio C Hamano6231f822011-10-24 05:18:52559The value is meant to be interpreted by the shell when it is used.
560It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable.
561When not configured the default commit message editor is used instead.
562
Junio C Hamano28d8ede2007-07-05 05:51:38563core.pager::
Junio C Hamano076ffcc2013-02-06 05:13:21564The command that Git will use to paginate output. Can
Junio C Hamano0551f6a2008-08-25 00:33:33565be overridden with the `GIT_PAGER` environment
Junio C Hamano076ffcc2013-02-06 05:13:21566variable. Note that Git sets the `LESS` environment
Junio C Hamano0551f6a2008-08-25 00:33:33567variable to `FRSX` if it is unset when it runs the
568pager. One can change these settings by setting the
Junio C Hamanoa476efa2008-10-10 15:31:42569`LESS` variable to some other value. Alternately,
570these settings can be overridden on a project or
571global basis by setting the `core.pager` option.
Junio C Hamanoa1295452012-11-13 22:32:04572Setting `core.pager` has no effect on the `LESS`
Junio C Hamanoa476efa2008-10-10 15:31:42573environment variable behaviour above, so if you want
Junio C Hamano076ffcc2013-02-06 05:13:21574to override Git's default settings this way, you need
Junio C Hamanoa476efa2008-10-10 15:31:42575to be explicit. For example, to disable the S option
576in a backward compatible manner, set `core.pager`
Junio C Hamanoa1295452012-11-13 22:32:04577to `less -+S`. This will be passed to the shell by
Junio C Hamano076ffcc2013-02-06 05:13:21578Git, which will translate the final command to
Junio C Hamanoa1295452012-11-13 22:32:04579`LESS=FRSX less -+S`.
Junio C Hamano28d8ede2007-07-05 05:51:38580
Junio C Hamano942b35e2007-12-09 10:19:33581core.whitespace::
582A comma separated list of common whitespace problems to
Junio C Hamano1aa40d22010-01-21 17:46:43583notice. 'git diff' will use `color.diff.whitespace` to
584highlight them, and 'git apply --whitespace=error' will
Junio C Hamano3db8b412008-07-26 06:45:59585consider them as errors. You can prefix `-` to disable
586any of them (e.g. `-trailing-space`):
Junio C Hamano942b35e2007-12-09 10:19:33587+
Junio C Hamanob71a22d2009-10-17 08:23:47588* `blank-at-eol` treats trailing whitespaces at the end of the line
Junio C Hamano942b35e2007-12-09 10:19:33589 as an error (enabled by default).
590* `space-before-tab` treats a space character that appears immediately
591 before a tab character in the initial indent part of the line as an
592 error (enabled by default).
Junio C Hamano281fd392012-09-17 23:57:41593* `indent-with-non-tab` treats a line that is indented with space
594 characters instead of the equivalent tabs as an error (not enabled by
595 default).
Junio C Hamanocb39aea2010-05-09 07:24:48596* `tab-in-indent` treats a tab character in the initial indent part of
597 the line as an error (not enabled by default).
Junio C Hamanob71a22d2009-10-17 08:23:47598* `blank-at-eof` treats blank lines added at the end of file as an error
599 (enabled by default).
600* `trailing-space` is a short-hand to cover both `blank-at-eol` and
601 `blank-at-eof`.
Junio C Hamano601f3e52008-02-25 08:40:42602* `cr-at-eol` treats a carriage-return at the end of line as
603 part of the line terminator, i.e. with it, `trailing-space`
604 does not trigger if the character before such a carriage-return
605 is not a whitespace (not enabled by default).
Junio C Hamanoeef01fe2010-12-13 08:31:58606* `tabwidth=<n>` tells how many character positions a tab occupies; this
Junio C Hamano076ffcc2013-02-06 05:13:21607 is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent`
Junio C Hamanoeef01fe2010-12-13 08:31:58608 errors. The default tab width is 8. Allowed values are 1 to 63.
Junio C Hamano942b35e2007-12-09 10:19:33609
Junio C Hamano9eb57532008-06-26 06:33:46610core.fsyncobjectfiles::
611This boolean will enable 'fsync()' when writing object files.
612+
613This is a total waste of time and effort on a filesystem that orders
614data writes properly, but can be useful for filesystems that do not use
615journalling (traditional UNIX filesystems) or that only journal metadata
616and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
617
Junio C Hamano610d1762008-11-28 06:27:13618core.preloadindex::
619Enable parallel index preload for operations like 'git diff'
620+
621This can speed up operations like 'git diff' and 'git status' especially
622on filesystems like NFS that have weak caching semantics and thus
Junio C Hamano076ffcc2013-02-06 05:13:21623relatively high IO latencies. With this set to 'true', Git will do the
Junio C Hamano610d1762008-11-28 06:27:13624index comparison to the filesystem data in parallel, allowing
625overlapping IO's.
626
Junio C Hamanoa9499de2009-04-30 03:38:48627core.createObject::
628You can set this to 'link', in which case a hardlink followed by
629a delete of the source are used to make sure that object creation
630will not overwrite existing objects.
631+
632On some file system/operating system combinations, this is unreliable.
633Set this config setting to 'rename' there; However, This will remove the
634check that makes sure that existing object files will not get overwritten.
Junio C Hamanoe91ea772009-04-26 01:41:41635
Junio C Hamano3b70d3c2009-11-21 17:37:37636core.notesRef::
637When showing commit messages, also show notes which are stored in
Junio C Hamanoa574a092010-06-13 19:57:10638the given ref. The ref must be fully qualified. If the given
639ref does not exist, it is not an error but means that no
640notes should be printed.
Junio C Hamano3b70d3c2009-11-21 17:37:37641+
Junio C Hamanoa574a092010-06-13 19:57:10642This setting defaults to "refs/notes/commits", and it can be overridden by
643the 'GIT_NOTES_REF' environment variable. See linkgit:git-notes[1].
Junio C Hamano3b70d3c2009-11-21 17:37:37644
Junio C Hamano3c8d6702010-01-13 23:09:03645core.sparseCheckout::
646Enable "sparse checkout" feature. See section "Sparse checkout" in
647linkgit:git-read-tree[1] for more information.
648
Junio C Hamano6371b0e2011-03-23 23:36:21649core.abbrev::
650Set the length object names are abbreviated to. If unspecified,
651many commands abbreviate to 7 hexdigits, which may not be enough
652for abbreviated object names to stay unique for sufficiently long
653time.
654
Junio C Hamano3d141512009-06-01 01:22:40655add.ignore-errors::
Junio C Hamano60186642010-12-02 14:18:26656add.ignoreErrors::
Junio C Hamano1aa40d22010-01-21 17:46:43657Tells 'git add' to continue adding files when some files cannot be
Junio C Hamano3d141512009-06-01 01:22:40658added due to indexing errors. Equivalent to the '--ignore-errors'
Junio C Hamano076ffcc2013-02-06 05:13:21659option of linkgit:git-add[1]. Older versions of Git accept only
Junio C Hamano60186642010-12-02 14:18:26660`add.ignore-errors`, which does not follow the usual naming
Junio C Hamano076ffcc2013-02-06 05:13:21661convention for configuration variables. Newer versions of Git
Junio C Hamano60186642010-12-02 14:18:26662honor `add.ignoreErrors` as well.
Junio C Hamano3d141512009-06-01 01:22:40663
Junio C Hamano33db4372006-06-07 19:51:45664alias.*::
Junio C Hamano35738e82008-01-07 07:55:46665Command aliases for the linkgit:git[1] command wrapper - e.g.
Junio C Hamano33db4372006-06-07 19:51:45666after defining "alias.last = cat-file commit HEAD", the invocation
667"git last" is equivalent to "git cat-file commit HEAD". To avoid
Junio C Hamanof1d14802006-06-08 00:48:17668confusion and troubles with script usage, aliases that
Junio C Hamano076ffcc2013-02-06 05:13:21669hide existing Git commands are ignored. Arguments are split by
Junio C Hamanof1d14802006-06-08 00:48:17670spaces, the usual shell quoting and escaping is supported.
671quote pair and a backslash can be used to quote them.
Junio C Hamanodbb64592007-09-01 11:17:39672+
673If the alias expansion is prefixed with an exclamation point,
674it will be treated as a shell command. For example, defining
675"alias.new = !gitk --all --not ORIG_HEAD", the invocation
676"git new" is equivalent to running the shell command
Junio C Hamano48bc1ce2009-07-09 16:49:19677"gitk --all --not ORIG_HEAD". Note that shell commands will be
678executed from the top-level directory of a repository, which may
679not necessarily be the current directory.
Junio C Hamano5f2627d2011-05-06 20:23:48680'GIT_PREFIX' is set as returned by running 'git rev-parse --show-prefix'
681from the original current directory. See linkgit:git-rev-parse[1].
Junio C Hamano9cb74f22007-02-12 04:15:05682
Junio C Hamanocaa712a2010-03-11 01:17:35683am.keepcr::
684If true, git-am will call git-mailsplit for patches in mbox format
685with parameter '--keep-cr'. In this case git-mailsplit will
Junio C Hamano619596a2010-08-18 22:15:35686not remove `\r` from lines ending with `\r\n`. Can be overridden
Junio C Hamanocaa712a2010-03-11 01:17:35687by giving '--no-keep-cr' from the command line.
688See linkgit:git-am[1], linkgit:git-mailsplit[1].
689
Junio C Hamanofe24db02009-08-22 05:10:47690apply.ignorewhitespace::
Junio C Hamano1aa40d22010-01-21 17:46:43691When set to 'change', tells 'git apply' to ignore changes in
Junio C Hamanofe24db02009-08-22 05:10:47692whitespace, in the same way as the '--ignore-space-change'
693option.
Junio C Hamano1aa40d22010-01-21 17:46:43694When set to one of: no, none, never, false tells 'git apply' to
Junio C Hamanofe24db02009-08-22 05:10:47695respect all whitespace differences.
696See linkgit:git-apply[1].
697
Junio C Hamano07824ce2006-04-25 07:36:54698apply.whitespace::
Junio C Hamano1aa40d22010-01-21 17:46:43699Tells 'git apply' how to handle whitespaces, in the same way
Junio C Hamano35738e82008-01-07 07:55:46700as the '--whitespace' option. See linkgit:git-apply[1].
Junio C Hamano07824ce2006-04-25 07:36:54701
Junio C Hamano7fd84172007-05-24 07:00:32702branch.autosetupmerge::
Junio C Hamano1aa40d22010-01-21 17:46:43703Tells 'git branch' and 'git checkout' to set up new branches
Junio C Hamano24bc09a2008-02-28 00:27:44704so that linkgit:git-pull[1] will appropriately merge from the
705starting point branch. Note that even if this option is not set,
Junio C Hamano7fd84172007-05-24 07:00:32706this behavior can be chosen per-branch using the `--track`
Junio C Hamano24bc09a2008-02-28 00:27:44707and `--no-track` options. The valid settings are: `false` -- no
708automatic setup is done; `true` -- automatic setup is done when the
Junio C Hamano97bcb482010-11-25 03:16:07709starting point is a remote-tracking branch; `always` --
710automatic setup is done when the starting point is either a
711local branch or remote-tracking
Junio C Hamano24bc09a2008-02-28 00:27:44712branch. This option defaults to true.
Junio C Hamano7fd84172007-05-24 07:00:32713
Junio C Hamano869bb802008-05-12 00:29:47714branch.autosetuprebase::
Junio C Hamano1aa40d22010-01-21 17:46:43715When a new branch is created with 'git branch' or 'git checkout'
Junio C Hamano076ffcc2013-02-06 05:13:21716that tracks another branch, this variable tells Git to set
Junio C Hamano869bb802008-05-12 00:29:47717up pull to rebase instead of merge (see "branch.<name>.rebase").
718When `never`, rebase is never automatically set to true.
719When `local`, rebase is set to true for tracked branches of
720other local branches.
721When `remote`, rebase is set to true for tracked branches of
Junio C Hamano97bcb482010-11-25 03:16:07722remote-tracking branches.
Junio C Hamano869bb802008-05-12 00:29:47723When `always`, rebase will be set to true for all tracking
724branches.
725See "branch.autosetupmerge" for details on how to set up a
726branch to track another branch.
727This option defaults to never.
728
Junio C Hamano47c1e3c2006-09-25 04:45:55729branch.<name>.remote::
Junio C Hamano63b6fdb2013-04-07 23:37:13730When on branch <name>, it tells 'git fetch' and 'git push'
731which remote to fetch from/push to. The remote to push to
732may be overridden with `remote.pushdefault` (for all branches).
733The remote to push to, for the current branch, may be further
734overridden by `branch.<name>.pushremote`. If no remote is
735configured, or if you are not on any branch, it defaults to
736`origin` for fetching and `remote.pushdefault` for pushing.
737
738branch.<name>.pushremote::
739When on branch <name>, it overrides `branch.<name>.remote` for
740pushing. It also overrides `remote.pushdefault` for pushing
741from branch <name>. When you pull from one place (e.g. your
742upstream) and push to another place (e.g. your own publishing
743repository), you would want to set `remote.pushdefault` to
744specify the remote to push to for all branches, and use this
745option to override it for a specific branch.
Junio C Hamano47c1e3c2006-09-25 04:45:55746
747branch.<name>.merge::
Junio C Hamano0706c802009-03-30 22:34:19748Defines, together with branch.<name>.remote, the upstream branch
Junio C Hamanob02377c2011-04-28 22:26:02749for the given branch. It tells 'git fetch'/'git pull'/'git rebase' which
Junio C Hamano1aa40d22010-01-21 17:46:43750branch to merge and can also affect 'git push' (see push.default).
751When in branch <name>, it tells 'git fetch' the default
Junio C Hamanoc2b47092007-10-25 06:50:31752refspec to be marked for merging in FETCH_HEAD. The value is
753handled like the remote part of a refspec, and must match a
754ref which is fetched from the remote given by
755"branch.<name>.remote".
Junio C Hamano1aa40d22010-01-21 17:46:43756The merge information is used by 'git pull' (which at first calls
757'git fetch') to lookup the default branch for merging. Without
758this option, 'git pull' defaults to merge the first refspec fetched.
Junio C Hamano96010b22006-12-09 21:15:46759Specify multiple values to get an octopus merge.
Junio C Hamano1aa40d22010-01-21 17:46:43760If you wish to setup 'git pull' so that it merges into <name> from
Junio C Hamano6e149c02007-03-16 10:21:07761another branch in the local repository, you can point
762branch.<name>.merge to the desired branch, and use the special setting
763`.` (a period) for branch.<name>.remote.
Junio C Hamano47c1e3c2006-09-25 04:45:55764
Junio C Hamano1b50ce92007-10-03 12:05:53765branch.<name>.mergeoptions::
766Sets default options for merging into branch <name>. The syntax and
Junio C Hamanoc0e55e72009-10-10 00:56:29767supported options are the same as those of linkgit:git-merge[1], but
Junio C Hamano1b50ce92007-10-03 12:05:53768option values containing whitespace characters are currently not
769supported.
770
Junio C Hamano0c999702007-12-03 09:57:55771branch.<name>.rebase::
772When true, rebase the branch <name> on top of the fetched branch,
Junio C Hamano6d76d612008-05-09 05:46:08773instead of merging the default branch from the default remote when
Junio C Hamano515ab1d2011-12-09 23:41:20774"git pull" is run. See "pull.rebase" for doing this in a non
775branch-specific manner.
776+
777*NOTE*: this is a possibly dangerous operation; do *not* use
778it unless you understand the implications (see linkgit:git-rebase[1]
779for details).
Junio C Hamano0c999702007-12-03 09:57:55780
Junio C Hamano46247182013-01-09 20:50:28781branch.<name>.description::
782Branch description, can be edited with
783`git branch --edit-description`. Branch description is
784automatically added in the format-patch cover letter or
785request-pull summary.
786
Junio C Hamano8760ea62008-03-14 08:58:45787browser.<tool>.cmd::
788Specify the command to invoke the specified browser. The
789specified command is evaluated in shell with the URLs passed
Junio C Hamano360e3a12011-07-13 23:51:56790as arguments. (See linkgit:git-web{litdd}browse[1].)
Junio C Hamano8760ea62008-03-14 08:58:45791
Junio C Hamanoe35a6fc2008-01-29 09:46:27792browser.<tool>.path::
793Override the path for the given tool that may be used to
794browse HTML help (see '-w' option in linkgit:git-help[1]) or a
795working repository in gitweb (see linkgit:git-instaweb[1]).
796
Junio C Hamano47b9acd2007-04-24 07:34:34797clean.requireForce::
Junio C Hamano422cfec2007-11-08 08:07:45798A boolean to make git-clean do nothing unless given -f
799or -n. Defaults to true.
Junio C Hamano47b9acd2007-04-24 07:34:34800
Junio C Hamanoeb692952007-01-03 22:02:12801color.branch::
802A boolean to enable/disable color in the output of
Junio C Hamano35738e82008-01-07 07:55:46803linkgit:git-branch[1]. May be set to `always`,
Junio C Hamano0fc8cd92007-12-06 03:26:21804`false` (or `never`) or `auto` (or `true`), in which case colors are used
Junio C Hamanoeb692952007-01-03 22:02:12805only when the output is to a terminal. Defaults to false.
806
807color.branch.<slot>::
808Use customized color for branch coloration. `<slot>` is one of
809`current` (the current branch), `local` (a local branch),
Junio C Hamano76927822013-04-19 21:26:57810`remote` (a remote-tracking branch in refs/remotes/),
811`upstream` (upstream tracking branch), `plain` (other
Junio C Hamano5a702332007-01-28 20:55:22812refs).
813+
814The value for these configuration variables is a list of colors (at most
815two) and attributes (at most one), separated by spaces. The colors
816accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
817`magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`,
818`blink` and `reverse`. The first color given is the foreground; the
819second is the background. The position of the attribute, if any,
820doesn't matter.
Junio C Hamanoeb692952007-01-03 22:02:12821
Junio C Hamano3f403b02006-12-13 10:14:13822color.diff::
Junio C Hamano5f2627d2011-05-06 20:23:48823Whether to use ANSI escape sequences to add color to patches.
824If this is set to `always`, linkgit:git-diff[1],
825linkgit:git-log[1], and linkgit:git-show[1] will use color
826for all patches. If it is set to `true` or `auto`, those
827commands will only use color when output is to the terminal.
828Defaults to false.
829+
830This does not affect linkgit:git-format-patch[1] nor the
831'git-diff-{asterisk}' plumbing commands. Can be overridden on the
832command line with the `--color[=<when>]` option.
Junio C Hamano9ae1a062006-07-10 08:12:34833
Junio C Hamano3f403b02006-12-13 10:14:13834color.diff.<slot>::
Junio C Hamano5a702332007-01-28 20:55:22835Use customized color for diff colorization. `<slot>` specifies
836which part of the patch to use the specified color, and is one
837of `plain` (context text), `meta` (metainformation), `frag`
Junio C Hamano2bd8a742009-12-01 21:16:59838(hunk header), 'func' (function in hunk header), `old` (removed lines),
839`new` (added lines), `commit` (commit headers), or `whitespace`
840(highlighting whitespace errors). The values of these variables may be
841specified as in color.branch.<slot>.
Junio C Hamano9ae1a062006-07-10 08:12:34842
Junio C Hamano7d449522010-07-01 00:08:51843color.decorate.<slot>::
844Use customized color for 'git log --decorate' output. `<slot>` is one
845of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
Junio C Hamano97bcb482010-11-25 03:16:07846branches, remote-tracking branches, tags, stash and HEAD, respectively.
Junio C Hamano7d449522010-07-01 00:08:51847
Junio C Hamanod257cff2009-03-18 05:27:16848color.grep::
849When set to `always`, always highlight matches. When `false` (or
850`never`), never. When set to `true` or `auto`, use color only
851when the output is written to the terminal. Defaults to `false`.
852
Junio C Hamano0299d922010-03-20 20:59:31853color.grep.<slot>::
854Use customized color for grep colorization. `<slot>` specifies which
855part of the line to use the specified color, and is one of
856+
857--
858`context`;;
859non-matching text in context lines (when using `-A`, `-B`, or `-C`)
860`filename`;;
861filename prefix (when not using `-h`)
862`function`;;
863function name lines (when using `-p`)
864`linenumber`;;
865line number prefix (when using `-n`)
866`match`;;
867matching text
868`selected`;;
869non-matching text in selected lines
870`separator`;;
871separators between fields on a line (`:`, `-`, and `=`)
872and between hunks (`--`)
873--
874+
875The values of these variables may be specified as in color.branch.<slot>.
Junio C Hamanod257cff2009-03-18 05:27:16876
Junio C Hamano00b8b632007-12-07 09:50:49877color.interactive::
Junio C Hamano35738e82008-01-07 07:55:46878When set to `always`, always use colors for interactive prompts
Junio C Hamanoba4b9282008-07-06 05:20:31879and displays (such as those used by "git-add --interactive").
Junio C Hamano00b8b632007-12-07 09:50:49880When false (or `never`), never. When set to `true` or `auto`, use
881colors only when the output is to the terminal. Defaults to false.
882
883color.interactive.<slot>::
Junio C Hamano1aa40d22010-01-21 17:46:43884Use customized color for 'git add --interactive'
Junio C Hamanoe5bf6c12009-02-07 21:43:10885output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
886four distinct types of normal output from interactive
Junio C Hamano27a128b2009-08-13 01:23:00887commands. The values of these variables may be specified as
Junio C Hamano00b8b632007-12-07 09:50:49888in color.branch.<slot>.
889
Junio C Hamanoe7935c42006-12-13 21:32:17890color.pager::
891A boolean to enable/disable colored output when the pager is in
892use (default is true).
893
Junio C Hamano52ba2952009-05-18 17:43:02894color.showbranch::
895A boolean to enable/disable color in the output of
896linkgit:git-show-branch[1]. May be set to `always`,
897`false` (or `never`) or `auto` (or `true`), in which case colors are used
898only when the output is to a terminal. Defaults to false.
899
Junio C Hamanoe7935c42006-12-13 21:32:17900color.status::
901A boolean to enable/disable color in the output of
Junio C Hamano35738e82008-01-07 07:55:46902linkgit:git-status[1]. May be set to `always`,
Junio C Hamano0fc8cd92007-12-06 03:26:21903`false` (or `never`) or `auto` (or `true`), in which case colors are used
Junio C Hamanoe7935c42006-12-13 21:32:17904only when the output is to a terminal. Defaults to false.
905
906color.status.<slot>::
907Use customized color for status colorization. `<slot>` is
908one of `header` (the header text of the status message),
Junio C Hamano7d23f5e2006-12-16 07:44:04909`added` or `updated` (files which are added but not committed),
910`changed` (files which are changed but not added in the index),
Junio C Hamano076ffcc2013-02-06 05:13:21911`untracked` (files which are not tracked by Git),
Junio C Hamano0d75e872010-12-17 06:57:26912`branch` (the current branch), or
Junio C Hamanob713ff12008-05-24 01:12:30913`nobranch` (the color the 'no branch' warning is shown in, defaulting
914to red). The values of these variables may be specified as in
915color.branch.<slot>.
Junio C Hamanoe7935c42006-12-13 21:32:17916
Junio C Hamano83d46a22008-02-21 02:29:42917color.ui::
Junio C Hamano5f2627d2011-05-06 20:23:48918This variable determines the default value for variables such
919as `color.diff` and `color.grep` that control the use of color
920per command family. Its scope will expand as more commands learn
921configuration to set a default for the `--color` option. Set it
922to `always` if you want all output not intended for machine
923consumption to use color, to `true` or `auto` if you want such
924output to use color when written to the terminal, or to `false` or
Junio C Hamano076ffcc2013-02-06 05:13:21925`never` if you prefer Git commands not to use color unless enabled
Junio C Hamano5f2627d2011-05-06 20:23:48926explicitly with some other configuration or the `--color` option.
Junio C Hamano83d46a22008-02-21 02:29:42927
Junio C Hamano22700fb2012-05-03 23:07:25928column.ui::
929Specify whether supported commands should output in columns.
930This variable consists of a list of tokens separated by spaces
931or commas:
932+
933--
934`always`;;
935always show in columns
936`never`;;
937never show in columns
938`auto`;;
939show in columns if the output is to the terminal
940`column`;;
941fill columns before rows (default)
942`row`;;
943fill rows before columns
944`plain`;;
945show in one column
946`dense`;;
947make unequal size columns to utilize more space
948`nodense`;;
949make equal size columns
950--
951+
Junio C Hamanobcaa8bc2012-07-03 22:17:20952This option defaults to 'never'.
Junio C Hamano22700fb2012-05-03 23:07:25953
954column.branch::
955Specify whether to output branch listing in `git branch` in columns.
956See `column.ui` for details.
957
958column.status::
959Specify whether to output untracked files in `git status` in columns.
960See `column.ui` for details.
961
962column.tag::
963Specify whether to output tag listing in `git tag` in columns.
964See `column.ui` for details.
965
Junio C Hamanoce836cc2013-01-21 02:01:53966commit.cleanup::
967This setting overrides the default of the `--cleanup` option in
968`git commit`. See linkgit:git-commit[1] for details. Changing the
969default can be useful when you always want to keep lines that begin
970with comment character `#` in your log message, in which case you
971would do `git config commit.cleanup whitespace` (note that you will
972have to remove the help lines that begin with `#` in the commit log
973template yourself, if you do this).
974
Junio C Hamanod0d892c2010-01-24 20:06:29975commit.status::
Junio C Hamano6ce6b6c2010-01-18 01:25:50976A boolean to enable/disable inclusion of status information in the
977commit message template when using an editor to prepare the commit
978message. Defaults to true.
979
Junio C Hamano4653c6f2008-11-26 22:50:20980commit.template::
981Specify a file to use as the template for new commit messages.
Junio C Hamanob76a6862012-05-02 22:02:46982"`~/`" is expanded to the value of `$HOME` and "`~user/`" to the
Junio C Hamanobf984de2009-11-23 06:11:19983specified user's home directory.
Junio C Hamano4653c6f2008-11-26 22:50:20984
Junio C Hamano0df92712011-12-21 22:30:44985credential.helper::
986Specify an external helper to be called when a username or
987password credential is needed; the helper may consult external
988storage to avoid prompting the user for the credentials. See
989linkgit:gitcredentials[7] for details.
990
991credential.useHttpPath::
992When acquiring credentials, consider the "path" component of an http
993or https URL to be important. Defaults to false. See
994linkgit:gitcredentials[7] for more information.
995
996credential.username::
997If no username is set for a network authentication, use this username
998by default. See credential.<context>.* below, and
999linkgit:gitcredentials[7].
1000
1001credential.<url>.*::
1002Any of the credential.* options above can be applied selectively to
1003some credentials. For example "credential.https://example.com.username"
1004would set the default username only for https connections to
1005example.com. See linkgit:gitcredentials[7] for details on how URLs are
1006matched.
1007
Junio C Hamano209ebe82011-04-27 21:09:591008include::diff-config.txt[]
Junio C Hamano3bd66e92009-04-18 06:17:561009
1010difftool.<tool>.path::
1011Override the path for the given tool. This is useful in case
1012your tool is not in the PATH.
1013
1014difftool.<tool>.cmd::
1015Specify the command to invoke the specified diff tool.
1016The specified command is evaluated in shell with the following
1017variables available: 'LOCAL' is set to the name of the temporary
1018file containing the contents of the diff pre-image and 'REMOTE'
1019is set to the name of the temporary file containing the contents
1020of the diff post-image.
1021
1022difftool.prompt::
1023Prompt before each invocation of the diff tool.
1024
Junio C Hamano0d75e872010-12-17 06:57:261025fetch.recurseSubmodules::
Junio C Hamano5cd15182011-04-05 00:21:101026This option can be either set to a boolean value or to 'on-demand'.
1027Setting it to a boolean changes the behavior of fetch and pull to
1028unconditionally recurse into submodules when set to true or to not
1029recurse at all when set to false. When set to 'on-demand' (the default
1030value), fetch and pull will only recurse into a populated submodule
1031when its superproject retrieves a commit that updates the submodule's
1032reference.
Junio C Hamano0d75e872010-12-17 06:57:261033
Junio C Hamano8fb66e52011-10-05 20:59:511034fetch.fsckObjects::
1035If it is set to true, git-fetch-pack will check all fetched
1036objects. It will abort in the case of a malformed object or a
1037broken link. The result of an abort are only dangling objects.
1038Defaults to false. If not set, the value of `transfer.fsckObjects`
1039is used instead.
1040
Junio C Hamano54ea8d32007-01-25 07:59:481041fetch.unpackLimit::
Junio C Hamano076ffcc2013-02-06 05:13:211042If the number of objects fetched over the Git native
Junio C Hamano54ea8d32007-01-25 07:59:481043transfer is below this
1044limit, then the objects will be unpacked into loose object
1045files. However if the number of received objects equals or
1046exceeds this limit then the received pack will be stored as
1047a pack, after adding any missing delta bases. Storing the
1048pack from a push can make the push operation complete faster,
Junio C Hamanoe77b0152008-01-12 06:44:171049especially on slow filesystems. If not set, the value of
1050`transfer.unpackLimit` is used instead.
Junio C Hamano54ea8d32007-01-25 07:59:481051
Junio C Hamanof4581102009-04-25 08:29:591052format.attach::
1053Enable multipart/mixed attachments as the default for
1054'format-patch'. The value can also be a double quoted string
1055which will enable attachments as the default and set the
1056value as the boundary. See the --attach option in
1057linkgit:git-format-patch[1].
1058
Junio C Hamano8c5802d2007-11-15 00:13:361059format.numbered::
Junio C Hamano7d06a8a2008-10-20 05:42:331060A boolean which can enable or disable sequence numbers in patch
1061subjects. It defaults to "auto" which enables it only if there
1062is more than one patch. It can be enabled or disabled for all
1063messages by setting it to "true" or "false". See --numbered
1064option in linkgit:git-format-patch[1].
Junio C Hamano8c5802d2007-11-15 00:13:361065
Junio C Hamano07824ce2006-04-25 07:36:541066format.headers::
1067Additional email headers to include in a patch to be submitted
Junio C Hamano35738e82008-01-07 07:55:461068by mail. See linkgit:git-format-patch[1].
Junio C Hamano07824ce2006-04-25 07:36:541069
Junio C Hamano70664a02010-07-13 22:48:051070format.to::
Junio C Hamanof4581102009-04-25 08:29:591071format.cc::
Junio C Hamano70664a02010-07-13 22:48:051072Additional recipients to include in a patch to be submitted
1073by mail. See the --to and --cc options in
1074linkgit:git-format-patch[1].
Junio C Hamanof4581102009-04-25 08:29:591075
1076format.subjectprefix::
1077The default for format-patch is to output files with the '[PATCH]'
1078subject prefix. Use this variable to change that prefix.
1079
Junio C Hamano89a57342010-06-22 23:22:551080format.signature::
1081The default for format-patch is to output a signature containing
Junio C Hamano076ffcc2013-02-06 05:13:211082the Git version number. Use this variable to change that default.
Junio C Hamano89a57342010-06-22 23:22:551083Set this variable to the empty string ("") to suppress
1084signature generation.
1085
Junio C Hamanod4c8e112007-03-04 10:32:381086format.suffix::
1087The default for format-patch is to output files with the suffix
1088`.patch`. Use this variable to change that suffix (make sure to
1089include the dot if you want it).
1090
Junio C Hamano86bcccc2008-03-08 09:33:551091format.pretty::
1092The default pretty format for log/show/whatchanged command,
1093See linkgit:git-log[1], linkgit:git-show[1],
1094linkgit:git-whatchanged[1].
1095
Junio C Hamanoea6a7642009-03-11 23:56:191096format.thread::
Junio C Hamano1aa40d22010-01-21 17:46:431097The default threading style for 'git format-patch'. Can be
Junio C Hamanob141a922010-01-10 19:55:141098a boolean value, or `shallow` or `deep`. `shallow` threading
1099makes every mail a reply to the head of the series,
Junio C Hamanoea6a7642009-03-11 23:56:191100where the head is chosen from the cover letter, the
Junio C Hamanob76a6862012-05-02 22:02:461101`--in-reply-to`, and the first patch mail, in this order.
Junio C Hamanof4581102009-04-25 08:29:591102`deep` threading makes every mail a reply to the previous one.
Junio C Hamanoea6a7642009-03-11 23:56:191103A true boolean value is the same as `shallow`, and a false
1104value disables threading.
1105
Junio C Hamano5f9a6f02009-04-06 08:26:561106format.signoff::
1107 A boolean value which lets you enable the `-s/--signoff` option of
1108 format-patch by default. *Note:* Adding the Signed-off-by: line to a
1109 patch should be a conscious act and means that you certify you have
1110 the rights to submit this work under the same open source license.
1111 Please see the 'SubmittingPatches' document for further discussion.
1112
Junio C Hamanoea3b7522013-04-18 19:37:531113format.coverLetter::
1114A boolean that controls whether to generate a cover-letter when
1115format-patch is invoked, but in addition can be set to "auto", to
1116generate a cover-letter only when there's more than one patch.
1117
Junio C Hamano209ebe82011-04-27 21:09:591118filter.<driver>.clean::
1119The command which is used to convert the content of a worktree
1120file to a blob upon checkin. See linkgit:gitattributes[5] for
1121details.
1122
1123filter.<driver>.smudge::
1124The command which is used to convert the content of a blob
1125object to a worktree file upon checkout. See
1126linkgit:gitattributes[5] for details.
1127
Junio C Hamanof2ce2972007-05-20 19:12:091128gc.aggressiveWindow::
1129The window size parameter used in the delta compression
Junio C Hamano1aa40d22010-01-21 17:46:431130algorithm used by 'git gc --aggressive'. This defaults
Junio C Hamanob04bb3f2010-04-14 14:07:361131to 250.
Junio C Hamanof2ce2972007-05-20 19:12:091132
Junio C Hamano1b50ce92007-10-03 12:05:531133gc.auto::
1134When there are approximately more than this many loose
1135objects in the repository, `git gc --auto` will pack them.
1136Some Porcelain commands use this command to perform a
Junio C Hamanoe77b0152008-01-12 06:44:171137light-weight garbage collection from time to time. The
1138default value is 6700. Setting this to 0 disables it.
Junio C Hamano1b50ce92007-10-03 12:05:531139
1140gc.autopacklimit::
1141When there are more than this many packs that are not
1142marked with `*.keep` file in the repository, `git gc
Junio C Hamanoe77b0152008-01-12 06:44:171143--auto` consolidates them into one larger pack. The
Junio C Hamano25c0b702008-03-23 09:41:371144default value is 50. Setting this to 0 disables it.
Junio C Hamano1b50ce92007-10-03 12:05:531145
Junio C Hamano9d52e572007-02-13 23:48:201146gc.packrefs::
Junio C Hamanob141a922010-01-10 19:55:141147Running `git pack-refs` in a repository renders it
1148unclonable by Git versions prior to 1.5.1.2 over dumb
1149transports such as HTTP. This variable determines whether
Junio C Hamanocdd1c332010-12-20 10:08:001150'git gc' runs `git pack-refs`. This can be set to `notbare`
Junio C Hamanob141a922010-01-10 19:55:141151to enable it within all non-bare repos or it can be set to a
1152boolean value. The default is `true`.
Junio C Hamano9d52e572007-02-13 23:48:201153
Junio C Hamano09a926d2008-03-13 07:55:291154gc.pruneexpire::
Junio C Hamano1aa40d22010-01-21 17:46:431155When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
Junio C Hamanoa3148f52009-01-14 08:49:571156Override the grace period with this config variable. The value
1157"now" may be used to disable this grace period and always prune
1158unreachable objects immediately.
Junio C Hamano09a926d2008-03-13 07:55:291159
Junio C Hamano74640642006-12-27 10:59:551160gc.reflogexpire::
Junio C Hamanocc7636a2010-05-21 14:57:531161gc.<pattern>.reflogexpire::
Junio C Hamano1aa40d22010-01-21 17:46:431162'git reflog expire' removes reflog entries older than
Junio C Hamanocc7636a2010-05-21 14:57:531163this time; defaults to 90 days. With "<pattern>" (e.g.
1164"refs/stash") in the middle the setting applies only to
1165the refs that match the <pattern>.
Junio C Hamano74640642006-12-27 10:59:551166
1167gc.reflogexpireunreachable::
Junio C Hamanocc7636a2010-05-21 14:57:531168gc.<ref>.reflogexpireunreachable::
Junio C Hamano1aa40d22010-01-21 17:46:431169'git reflog expire' removes reflog entries older than
Junio C Hamano74640642006-12-27 10:59:551170this time and are not reachable from the current tip;
Junio C Hamanocc7636a2010-05-21 14:57:531171defaults to 30 days. With "<pattern>" (e.g. "refs/stash")
1172in the middle, the setting applies only to the refs that
1173match the <pattern>.
Junio C Hamano74640642006-12-27 10:59:551174
1175gc.rerereresolved::
1176Records of conflicted merge you resolved earlier are
Junio C Hamano1aa40d22010-01-21 17:46:431177kept for this many days when 'git rerere gc' is run.
Junio C Hamano35738e82008-01-07 07:55:461178The default is 60 days. See linkgit:git-rerere[1].
Junio C Hamano74640642006-12-27 10:59:551179
1180gc.rerereunresolved::
1181Records of conflicted merge you have not resolved are
Junio C Hamano1aa40d22010-01-21 17:46:431182kept for this many days when 'git rerere gc' is run.
Junio C Hamano35738e82008-01-07 07:55:461183The default is 15 days. See linkgit:git-rerere[1].
Junio C Hamano74640642006-12-27 10:59:551184
Junio C Hamanoa3148f52009-01-14 08:49:571185gitcvs.commitmsgannotation::
1186Append this string to each commit message. Set to empty string
1187to disable this feature. Defaults to "via git-CVS emulator".
1188
Junio C Hamano07824ce2006-04-25 07:36:541189gitcvs.enabled::
Junio C Hamanoa6387422007-08-25 03:54:271190Whether the CVS server interface is enabled for this repository.
Junio C Hamano35738e82008-01-07 07:55:461191See linkgit:git-cvsserver[1].
Junio C Hamano07824ce2006-04-25 07:36:541192
1193gitcvs.logfile::
Junio C Hamanoa6387422007-08-25 03:54:271194Path to a log file where the CVS server interface well... logs
Junio C Hamano35738e82008-01-07 07:55:461195various stuff. See linkgit:git-cvsserver[1].
Junio C Hamano07824ce2006-04-25 07:36:541196
Junio C Hamano17bd2272008-09-01 06:11:171197gitcvs.usecrlfattr::
Junio C Hamanobb88cf42010-06-21 15:23:551198If true, the server will look up the end-of-line conversion
1199attributes for files to determine the '-k' modes to use. If
Junio C Hamano076ffcc2013-02-06 05:13:211200the attributes force Git to treat a file as text,
Junio C Hamano619596a2010-08-18 22:15:351201the '-k' mode will be left blank so CVS clients will
Junio C Hamanobb88cf42010-06-21 15:23:551202treat it as text. If they suppress text conversion, the file
Junio C Hamanocb1c44f2008-08-06 06:19:331203will be set with '-kb' mode, which suppresses any newline munging
Junio C Hamanobb88cf42010-06-21 15:23:551204the client might otherwise do. If the attributes do not allow
1205the file type to be determined, then 'gitcvs.allbinary' is
1206used. See linkgit:gitattributes[5].
Junio C Hamanodfccbb02008-05-26 01:16:141207
Junio C Hamanod9e0e5d2007-04-14 16:22:041208gitcvs.allbinary::
Junio C Hamanodfccbb02008-05-26 01:16:141209This is used if 'gitcvs.usecrlfattr' does not resolve
1210the correct '-kb' mode to use. If true, all
1211unresolved files are sent to the client in
1212mode '-kb'. This causes the client to treat them
1213as binary files, which suppresses any newline munging it
1214otherwise might do. Alternatively, if it is set to "guess",
1215then the contents of the file are examined to decide if
1216it is binary, similar to 'core.autocrlf'.
Junio C Hamanoa2ad99e2007-04-18 09:57:041217
1218gitcvs.dbname::
1219Database used by git-cvsserver to cache revision information
Junio C Hamano076ffcc2013-02-06 05:13:211220derived from the Git repository. The exact meaning depends on the
Junio C Hamanoa2ad99e2007-04-18 09:57:041221used database driver, for SQLite (which is the default driver) this
1222is a filename. Supports variable substitution (see
Junio C Hamano35738e82008-01-07 07:55:461223linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).
Junio C Hamanoa2ad99e2007-04-18 09:57:041224Default: '%Ggitcvs.%m.sqlite'
1225
1226gitcvs.dbdriver::
1227Used Perl DBI driver. You can specify any available driver
1228 for this here, but it might not work. git-cvsserver is tested
1229with 'DBD::SQLite', reported to work with 'DBD::Pg', and
1230reported *not* to work with 'DBD::mysql'. Experimental feature.
1231May not contain double colons (`:`). Default: 'SQLite'.
Junio C Hamano35738e82008-01-07 07:55:461232See linkgit:git-cvsserver[1].
Junio C Hamanod9e0e5d2007-04-14 16:22:041233
Junio C Hamanoa2ad99e2007-04-18 09:57:041234gitcvs.dbuser, gitcvs.dbpass::
1235Database user and password. Only useful if setting 'gitcvs.dbdriver',
1236since SQLite has no concept of database users and/or passwords.
1237'gitcvs.dbuser' supports variable substitution (see
Junio C Hamano35738e82008-01-07 07:55:461238linkgit:git-cvsserver[1] for details).
Junio C Hamanoa2ad99e2007-04-18 09:57:041239
Junio C Hamanoa74efce2008-04-02 08:39:081240gitcvs.dbTableNamePrefix::
1241Database table name prefix. Prepended to the names of any
1242database tables used, allowing a single database to be used
1243for several repositories. Supports variable substitution (see
1244linkgit:git-cvsserver[1] for details). Any non-alphabetic
1245characters will be replaced with underscores.
1246
Junio C Hamanodfccbb02008-05-26 01:16:141247All gitcvs variables except for 'gitcvs.usecrlfattr' and
1248'gitcvs.allbinary' can also be specified as
1249'gitcvs.<access_method>.<varname>' (where 'access_method'
Junio C Hamanoa6387422007-08-25 03:54:271250is one of "ext" and "pserver") to make them apply only for the given
1251access method.
Junio C Hamanoa2ad99e2007-04-18 09:57:041252
Junio C Hamano11821ed2011-10-19 18:42:091253gitweb.category::
1254gitweb.description::
1255gitweb.owner::
1256gitweb.url::
1257See linkgit:gitweb[1] for description.
1258
1259gitweb.avatar::
1260gitweb.blame::
1261gitweb.grep::
1262gitweb.highlight::
1263gitweb.patches::
1264gitweb.pickaxe::
1265gitweb.remote_heads::
1266gitweb.showsizes::
1267gitweb.snapshot::
1268See linkgit:gitweb.conf[5] for description.
1269
Junio C Hamanoa03ac862011-04-02 04:32:291270grep.lineNumber::
1271If set to true, enable '-n' option by default.
1272
Junio C Hamanoa00504d2012-08-27 21:11:231273grep.patternType::
1274Set the default matching behavior. Using a value of 'basic', 'extended',
1275'fixed', or 'perl' will enable the '--basic-regexp', '--extended-regexp',
1276'--fixed-strings', or '--perl-regexp' option accordingly, while the
1277value 'default' will return to the default matching behavior.
1278
Junio C Hamanoa03ac862011-04-02 04:32:291279grep.extendedRegexp::
Junio C Hamanoa00504d2012-08-27 21:11:231280If set to true, enable '--extended-regexp' option by default. This
1281option is ignored when the 'grep.patternType' option is set to a value
1282other than 'default'.
Junio C Hamanoa03ac862011-04-02 04:32:291283
Junio C Hamano4fd24422012-01-06 21:52:431284gpg.program::
1285Use this custom program instead of "gpg" found on $PATH when
1286making or verifying a PGP signature. The program must support the
1287same command line interface as GPG, namely, to verify a detached
1288signature, "gpg --verify $file - <$signature" is run, and the
1289program is expected to signal a good signature by exiting with
1290code 0, and to generate an ascii-armored detached signature, the
1291standard input of "gpg -bsau $key" is fed with the contents to be
1292signed, and the program is expected to send the result to its
1293standard output.
1294
Junio C Hamano6d76d612008-05-09 05:46:081295gui.commitmsgwidth::
1296Defines how wide the commit message window is in the
1297linkgit:git-gui[1]. "75" is the default.
1298
1299gui.diffcontext::
1300Specifies how many context lines should be used in calls to diff
1301made by the linkgit:git-gui[1]. The default is "5".
1302
Junio C Hamanod3452a02008-11-15 08:07:551303gui.encoding::
1304Specifies the default encoding to use for displaying of
1305file contents in linkgit:git-gui[1] and linkgit:gitk[1].
1306It can be overridden by setting the 'encoding' attribute
1307for relevant files (see linkgit:gitattributes[5]).
1308If this option is not set, the tools default to the
1309locale encoding.
1310
Junio C Hamano6d76d612008-05-09 05:46:081311gui.matchtrackingbranch::
1312Determines if new branches created with linkgit:git-gui[1] should
1313default to tracking remote branches with matching names or
1314not. Default: "false".
1315
1316gui.newbranchtemplate::
1317Is used as suggested name when creating new branches using the
1318linkgit:git-gui[1].
1319
1320gui.pruneduringfetch::
Junio C Hamano97bcb482010-11-25 03:16:071321"true" if linkgit:git-gui[1] should prune remote-tracking branches when
Junio C Hamano6d76d612008-05-09 05:46:081322performing a fetch. The default value is "false".
1323
1324gui.trustmtime::
1325Determines if linkgit:git-gui[1] should trust the file modification
1326timestamp or not. By default the timestamps are not trusted.
1327
1328gui.spellingdictionary::
1329Specifies the dictionary used for spell checking commit messages in
1330the linkgit:git-gui[1]. When set to "none" spell checking is turned
1331off.
1332
Junio C Hamanod3452a02008-11-15 08:07:551333gui.fastcopyblame::
Junio C Hamano1aa40d22010-01-21 17:46:431334If true, 'git gui blame' uses `-C` instead of `-C -C` for original
Junio C Hamanod3452a02008-11-15 08:07:551335location detection. It makes blame significantly faster on huge
1336repositories at the expense of less thorough copy detection.
1337
1338gui.copyblamethreshold::
Junio C Hamano610d1762008-11-28 06:27:131339Specifies the threshold to use in 'git gui blame' original location
Junio C Hamanod3452a02008-11-15 08:07:551340detection, measured in alphanumeric characters. See the
1341linkgit:git-blame[1] manual for more information on copy detection.
1342
1343gui.blamehistoryctx::
1344Specifies the radius of history context in days to show in
1345linkgit:gitk[1] for the selected commit, when the `Show History
1346Context` menu item is invoked from 'git gui blame'. If this
1347variable is set to zero, the whole history is shown.
1348
Junio C Hamano92d312a2008-12-15 07:22:201349guitool.<name>.cmd::
1350Specifies the shell command line to execute when the corresponding item
1351of the linkgit:git-gui[1] `Tools` menu is invoked. This option is
1352mandatory for every tool. The command is executed from the root of
1353the working directory, and in the environment it receives the name of
1354the tool as 'GIT_GUITOOL', the name of the currently selected file as
1355'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if
1356the head is detached, 'CUR_BRANCH' is empty).
1357
1358guitool.<name>.needsfile::
1359Run the tool only if a diff is selected in the GUI. It guarantees
1360that 'FILENAME' is not empty.
1361
1362guitool.<name>.noconsole::
1363Run the command silently, without creating a window to display its
1364output.
1365
1366guitool.<name>.norescan::
1367Don't rescan the working directory for changes after the tool
1368finishes execution.
1369
1370guitool.<name>.confirm::
1371Show a confirmation dialog before actually running the tool.
1372
1373guitool.<name>.argprompt::
1374Request a string argument from the user, and pass it to the tool
1375through the 'ARGS' environment variable. Since requesting an
1376argument implies confirmation, the 'confirm' option has no effect
1377if this is enabled. If the option is set to 'true', 'yes', or '1',
1378the dialog uses a built-in generic prompt; otherwise the exact
1379value of the variable is used.
1380
1381guitool.<name>.revprompt::
1382Request a single valid revision from the user, and set the
1383'REVISION' environment variable. In other aspects this option
1384is similar to 'argprompt', and can be used together with it.
1385
1386guitool.<name>.revunmerged::
1387Show only unmerged branches in the 'revprompt' subdialog.
1388This is useful for tools similar to merge or rebase, but not
1389for things like checkout or reset.
1390
1391guitool.<name>.title::
1392Specifies the title to use for the prompt dialog. The default
1393is the tool name.
1394
1395guitool.<name>.prompt::
1396Specifies the general prompt string to display at the top of
1397the dialog, before subsections for 'argprompt' and 'revprompt'.
1398The default value includes the actual command.
1399
Junio C Hamano4e272312008-01-08 09:13:211400help.browser::
1401Specify the browser that will be used to display help in the
1402'web' format. See linkgit:git-help[1].
1403
1404help.format::
1405Override the default help format used by linkgit:git-help[1].
1406Values 'man', 'info', 'web' and 'html' are supported. 'man' is
1407the default. 'web' and 'html' are the same.
1408
Junio C Hamanof24b8062008-09-09 01:34:391409help.autocorrect::
1410Automatically correct and execute mistyped commands after
1411waiting for the given number of deciseconds (0.1 sec). If more
1412than one command can be deduced from the entered text, nothing
1413will be executed. If the value of this option is negative,
1414the corrected command will be executed immediately. If the
1415value is 0 - the command will be just shown but not executed.
1416This is the default.
1417
Junio C Hamano5dd5fae2013-01-18 21:06:491418help.htmlpath::
1419Specify the path where the HTML documentation resides. File system paths
1420and URLs are supported. HTML pages will be prefixed with this path when
1421help is displayed in the 'web' format. This defaults to the documentation
1422path of your Git installation.
1423
Junio C Hamano58256872007-12-04 08:31:131424http.proxy::
Junio C Hamano3dd93922012-03-05 07:49:111425Override the HTTP proxy, normally configured using the 'http_proxy',
1426'https_proxy', and 'all_proxy' environment variables (see
1427`curl(1)`). This can be overridden on a per-remote basis; see
1428remote.<name>.proxy
Junio C Hamano58256872007-12-04 08:31:131429
Junio C Hamano4c4b0122011-06-30 01:19:321430http.cookiefile::
1431File containing previously stored cookie lines which should be used
Junio C Hamano076ffcc2013-02-06 05:13:211432in the Git http session, if they match the server. The file format
Junio C Hamano4c4b0122011-06-30 01:19:321433of the file to read cookies from should be plain HTTP headers or
1434the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
1435NOTE that the file specified with http.cookiefile is only used as
1436input. No cookies will be stored in the file.
1437
Junio C Hamano07824ce2006-04-25 07:36:541438http.sslVerify::
1439Whether to verify the SSL certificate when fetching or pushing
Junio C Hamano33db4372006-06-07 19:51:451440over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
Junio C Hamano07824ce2006-04-25 07:36:541441variable.
1442
1443http.sslCert::
1444File containing the SSL certificate when fetching or pushing
Junio C Hamano33db4372006-06-07 19:51:451445over HTTPS. Can be overridden by the 'GIT_SSL_CERT' environment
Junio C Hamano07824ce2006-04-25 07:36:541446variable.
1447
1448http.sslKey::
1449File containing the SSL private key when fetching or pushing
Junio C Hamano341071d2006-06-04 07:24:481450over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment
Junio C Hamano07824ce2006-04-25 07:36:541451variable.
1452
Junio C Hamano48bc1ce2009-07-09 16:49:191453http.sslCertPasswordProtected::
Junio C Hamano076ffcc2013-02-06 05:13:211454Enable Git's password prompt for the SSL certificate. Otherwise
Junio C Hamano48bc1ce2009-07-09 16:49:191455OpenSSL will prompt the user, possibly many times, if the
1456certificate or private key is encrypted. Can be overridden by the
1457'GIT_SSL_CERT_PASSWORD_PROTECTED' environment variable.
1458
Junio C Hamano07824ce2006-04-25 07:36:541459http.sslCAInfo::
1460File containing the certificates to verify the peer with when
Junio C Hamano341071d2006-06-04 07:24:481461fetching or pushing over HTTPS. Can be overridden by the
Junio C Hamano07824ce2006-04-25 07:36:541462'GIT_SSL_CAINFO' environment variable.
1463
1464http.sslCAPath::
1465Path containing files with the CA certificates to verify the peer
Junio C Hamano33db4372006-06-07 19:51:451466with when fetching or pushing over HTTPS. Can be overridden
Junio C Hamano07824ce2006-04-25 07:36:541467by the 'GIT_SSL_CAPATH' environment variable.
1468
Junio C Hamano76927822013-04-19 21:26:571469http.sslTry::
1470Attempt to use AUTH SSL/TLS and encrypted data transfers
1471when connecting via regular FTP protocol. This might be needed
1472if the FTP server requires it for security reasons or you wish
1473to connect securely whenever remote FTP server supports it.
1474Default is false since it might trigger certificate verification
1475errors on misconfigured servers.
1476
Junio C Hamano07824ce2006-04-25 07:36:541477http.maxRequests::
Junio C Hamano341071d2006-06-04 07:24:481478How many HTTP requests to launch in parallel. Can be overridden
Junio C Hamano07824ce2006-04-25 07:36:541479by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
1480
Junio C Hamanob141a922010-01-10 19:55:141481http.minSessions::
1482The number of curl sessions (counted across slots) to be kept across
1483requests. They will not be ended with curl_easy_cleanup() until
1484http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this
1485value will be capped at 1. Defaults to 1.
1486
Junio C Hamano3b70d3c2009-11-21 17:37:371487http.postBuffer::
1488Maximum size in bytes of the buffer used by smart HTTP
1489transports when POSTing data to the remote system.
1490For requests larger than this buffer size, HTTP/1.1 and
1491Transfer-Encoding: chunked is used to avoid creating a
1492massive pack file locally. Default is 1 MiB, which is
1493sufficient for most requests.
1494
Junio C Hamano07824ce2006-04-25 07:36:541495http.lowSpeedLimit, http.lowSpeedTime::
1496If the HTTP transfer speed is less than 'http.lowSpeedLimit'
1497for longer than 'http.lowSpeedTime' seconds, the transfer is aborted.
Junio C Hamano341071d2006-06-04 07:24:481498Can be overridden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and
Junio C Hamano07824ce2006-04-25 07:36:541499'GIT_HTTP_LOW_SPEED_TIME' environment variables.
1500
Junio C Hamanof1dcdfe2006-09-29 08:10:511501http.noEPSV::
1502A boolean which disables using of EPSV ftp command by curl.
Junio C Hamanod9e0e5d2007-04-14 16:22:041503This can helpful with some "poor" ftp servers which don't
Junio C Hamanof1dcdfe2006-09-29 08:10:511504support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'
1505environment variable. Default is false (curl will use EPSV).
1506
Junio C Hamano53ba6d02010-08-22 07:25:121507http.useragent::
1508The HTTP USER_AGENT string presented to an HTTP server. The default
Junio C Hamano076ffcc2013-02-06 05:13:211509value represents the version of the client Git such as git/1.7.1.
Junio C Hamano53ba6d02010-08-22 07:25:121510This option allows you to override this value to a more common value
1511such as Mozilla/4.0. This may be necessary, for instance, if
1512connecting through a firewall that restricts HTTP connections to a set
1513of common USER_AGENT strings (but not including those like git/1.7.1).
1514Can be overridden by the 'GIT_HTTP_USER_AGENT' environment variable.
1515
Junio C Hamano07824ce2006-04-25 07:36:541516i18n.commitEncoding::
Junio C Hamano076ffcc2013-02-06 05:13:211517Character encoding the commit messages are stored in; Git itself
Junio C Hamano07824ce2006-04-25 07:36:541518does not care per se, but this information is necessary e.g. when
1519importing commits from emails or in the gitk graphical history
1520browser (and possibly at other places in the future or in other
Junio C Hamano35738e82008-01-07 07:55:461521porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
Junio C Hamano07824ce2006-04-25 07:36:541522
Junio C Hamano51f92e22006-12-29 05:18:281523i18n.logOutputEncoding::
1524Character encoding the commit messages are converted to when
Junio C Hamano1aa40d22010-01-21 17:46:431525running 'git log' and friends.
Junio C Hamano51f92e22006-12-29 05:18:281526
Junio C Hamano4653c6f2008-11-26 22:50:201527imap::
1528The configuration variables in the 'imap' section are described
1529in linkgit:git-imap-send[1].
1530
Junio C Hamanocaa712a2010-03-11 01:17:351531init.templatedir::
1532Specify the directory from which templates will be copied.
1533(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
1534
Junio C Hamano4e272312008-01-08 09:13:211535instaweb.browser::
1536Specify the program that will be used to browse your working
1537repository in gitweb. See linkgit:git-instaweb[1].
1538
1539instaweb.httpd::
1540The HTTP daemon command-line to start gitweb on your working
1541repository. See linkgit:git-instaweb[1].
1542
1543instaweb.local::
1544If true the web server started by linkgit:git-instaweb[1] will
1545be bound to the local IP (127.0.0.1).
1546
1547instaweb.modulepath::
Junio C Hamano619596a2010-08-18 22:15:351548The default module path for linkgit:git-instaweb[1] to use
1549instead of /usr/lib/apache2/modules. Only used if httpd
1550is Apache.
Junio C Hamano4e272312008-01-08 09:13:211551
1552instaweb.port::
1553The port number to bind the gitweb httpd to. See
1554linkgit:git-instaweb[1].
1555
Junio C Hamanoe5bf6c12009-02-07 21:43:101556interactive.singlekey::
Junio C Hamano27a128b2009-08-13 01:23:001557In interactive commands, allow the user to provide one-letter
Junio C Hamanoe5bf6c12009-02-07 21:43:101558input with a single key (i.e., without hitting enter).
Junio C Hamanob76a6862012-05-02 22:02:461559Currently this is used by the `--patch` mode of
Junio C Hamano3d050d62011-05-17 06:43:341560linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1],
1561linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this
1562setting is silently ignored if portable keystroke input
1563is not available.
Junio C Hamanoe5bf6c12009-02-07 21:43:101564
Junio C Hamanof93530e2011-05-25 23:59:591565log.abbrevCommit::
1566If true, makes linkgit:git-log[1], linkgit:git-show[1], and
Junio C Hamanob76a6862012-05-02 22:02:461567linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may
1568override this option with `--no-abbrev-commit`.
Junio C Hamanof93530e2011-05-25 23:59:591569
Junio C Hamanob713ff12008-05-24 01:12:301570log.date::
Junio C Hamano2db3e752010-09-03 21:33:061571Set the default date-time mode for the 'log' command.
1572Setting a value for log.date is similar to using 'git log''s
Junio C Hamanob76a6862012-05-02 22:02:461573`--date` option. Possible values are `relative`, `local`,
Junio C Hamano2db3e752010-09-03 21:33:061574`default`, `iso`, `rfc`, and `short`; see linkgit:git-log[1]
1575for details.
Junio C Hamanob713ff12008-05-24 01:12:301576
Junio C Hamanocb39aea2010-05-09 07:24:481577log.decorate::
1578Print out the ref names of any commits that are shown by the log
1579command. If 'short' is specified, the ref name prefixes 'refs/heads/',
1580'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
1581specified, the full ref name (including prefix) will be printed.
1582This is the same as the log commands '--decorate' option.
1583
Junio C Hamanofe9acab2006-11-24 12:10:551584log.showroot::
1585If true, the initial commit will be shown as a big creation event.
1586This is equivalent to a diff against an empty tree.
Junio C Hamano35738e82008-01-07 07:55:461587Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
Junio C Hamanofe9acab2006-11-24 12:10:551588normally hide the root commit will now show it. True by default.
1589
Junio C Hamanoce836cc2013-01-21 02:01:531590log.mailmap::
1591If true, makes linkgit:git-log[1], linkgit:git-show[1], and
1592linkgit:git-whatchanged[1] assume `--use-mailmap`.
1593
Junio C Hamano8bc410e2009-02-15 10:38:191594mailmap.file::
1595The location of an augmenting mailmap file. The default
1596mailmap, located in the root of the repository, is loaded
1597first, then the mailmap file pointed to by this variable.
1598The location of the mailmap file may be in a repository
1599subdirectory, or somewhere outside of the repository itself.
1600See linkgit:git-shortlog[1] and linkgit:git-blame[1].
1601
Junio C Hamanoabad6da2013-01-06 09:06:321602mailmap.blob::
1603Like `mailmap.file`, but consider the value as a reference to a
1604blob in the repository. If both `mailmap.file` and
1605`mailmap.blob` are given, both are parsed, with entries from
1606`mailmap.file` taking precedence. In a bare repository, this
1607defaults to `HEAD:.mailmap`. In a non-bare repository, it
1608defaults to empty.
1609
Junio C Hamano8b588d52008-03-15 09:48:371610man.viewer::
1611Specify the programs that may be used to display help in the
1612'man' format. See linkgit:git-help[1].
1613
Junio C Hamano6d76d612008-05-09 05:46:081614man.<tool>.cmd::
1615Specify the command to invoke the specified man viewer. The
1616specified command is evaluated in shell with the man page
1617passed as argument. (See linkgit:git-help[1].)
Junio C Hamano103ad7f2007-03-14 11:19:261618
Junio C Hamano6d76d612008-05-09 05:46:081619man.<tool>.path::
1620Override the path for the given tool that may be used to
1621display help in the 'man' format. See linkgit:git-help[1].
Junio C Hamanoe90436a2007-04-22 07:22:131622
Junio C Hamano4653c6f2008-11-26 22:50:201623include::merge-config.txt[]
Junio C Hamanoa476efa2008-10-10 15:31:421624
Junio C Hamano1fbbbc12007-12-18 07:01:271625mergetool.<tool>.path::
1626Override the path for the given tool. This is useful in case
1627your tool is not in the PATH.
1628
Junio C Hamano86bcccc2008-03-08 09:33:551629mergetool.<tool>.cmd::
1630Specify the command to invoke the specified merge tool. The
1631specified command is evaluated in shell with the following
1632variables available: 'BASE' is the name of a temporary file
1633containing the common base of the files to be merged, if available;
1634'LOCAL' is the name of a temporary file containing the contents of
1635the file on the current branch; 'REMOTE' is the name of a temporary
1636file containing the contents of the file from the branch being
1637merged; 'MERGED' contains the name of the file to which the merge
1638tool should write the results of a successful merge.
1639
1640mergetool.<tool>.trustExitCode::
1641For a custom merge command, specify whether the exit code of
1642the merge command can be used to determine whether the merge was
1643successful. If this is not set to true then the merge target file
1644timestamp is checked and the merge assumed to have been successful
1645if the file has been updated, otherwise the user is prompted to
1646indicate the success of the merge.
1647
1648mergetool.keepBackup::
1649After performing a merge, the original file with conflict markers
1650can be saved as a file with a `.orig` extension. If this variable
1651is set to `false` then this file is not preserved. Defaults to
1652`true` (i.e. keep the backup files).
1653
Junio C Hamano10b7a342009-01-01 22:05:171654mergetool.keepTemporaries::
Junio C Hamano076ffcc2013-02-06 05:13:211655When invoking a custom merge tool, Git uses a set of temporary
Junio C Hamano10b7a342009-01-01 22:05:171656files to pass to the tool. If the tool returns an error and this
1657variable is set to `true`, then these temporary files will be
1658preserved, otherwise they will be removed after the tool has
1659exited. Defaults to `false`.
1660
1661mergetool.prompt::
1662Prompt before each invocation of the merge resolution program.
1663
Junio C Hamano31667362010-03-25 00:38:531664notes.displayRef::
1665The (fully qualified) refname from which to show notes when
1666showing commit messages. The value of this variable can be set
1667to a glob, in which case notes from all matching refs will be
1668shown. You may also specify this configuration variable
1669several times. A warning will be issued for refs that do not
1670exist, but a glob that does not match any refs is silently
1671ignored.
1672+
1673This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
1674environment variable, which must be a colon separated list of refs or
1675globs.
1676+
1677The effective value of "core.notesRef" (possibly overridden by
1678GIT_NOTES_REF) is also implicitly added to the list of refs to be
1679displayed.
1680
1681notes.rewrite.<command>::
1682When rewriting commits with <command> (currently `amend` or
Junio C Hamano076ffcc2013-02-06 05:13:211683`rebase`) and this variable is set to `true`, Git
Junio C Hamano31667362010-03-25 00:38:531684automatically copies your notes from the original to the
1685rewritten commit. Defaults to `true`, but see
1686"notes.rewriteRef" below.
Junio C Hamano31667362010-03-25 00:38:531687
1688notes.rewriteMode::
1689When copying notes during a rewrite (see the
1690"notes.rewrite.<command>" option), determines what to do if
1691the target commit already has a note. Must be one of
1692`overwrite`, `concatenate`, or `ignore`. Defaults to
1693`concatenate`.
1694+
1695This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
1696environment variable.
1697
1698notes.rewriteRef::
1699When copying notes during a rewrite, specifies the (fully
1700qualified) ref whose notes should be copied. The ref may be a
1701glob, in which case notes in all matching refs will be copied.
1702You may also specify this configuration several times.
1703+
1704Does not have a default value; you must configure this variable to
Junio C Hamano8fb66e52011-10-05 20:59:511705enable note rewriting. Set it to `refs/notes/commits` to enable
1706rewriting for the default commit notes.
Junio C Hamano2b3ee5d2010-05-08 05:41:181707+
1708This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
1709environment variable, which must be a colon separated list of refs or
1710globs.
Junio C Hamano31667362010-03-25 00:38:531711
Junio C Hamano75cc4c92006-07-24 08:25:031712pack.window::
Junio C Hamano35738e82008-01-07 07:55:461713The size of the window used by linkgit:git-pack-objects[1] when no
Junio C Hamano75cc4c92006-07-24 08:25:031714window size is given on the command line. Defaults to 10.
1715
Junio C Hamano91d44c52007-05-09 07:16:071716pack.depth::
Junio C Hamano35738e82008-01-07 07:55:461717The maximum delta depth used by linkgit:git-pack-objects[1] when no
Junio C Hamano91d44c52007-05-09 07:16:071718maximum depth is given on the command line. Defaults to 50.
1719
Junio C Hamano235d53f2007-07-13 00:25:151720pack.windowMemory::
Junio C Hamano35738e82008-01-07 07:55:461721The window memory size limit used by linkgit:git-pack-objects[1]
Junio C Hamano235d53f2007-07-13 00:25:151722when no limit is given on the command line. The value can be
1723suffixed with "k", "m", or "g". Defaults to 0, meaning no
1724limit.
1725
Junio C Hamanof2ce2972007-05-20 19:12:091726pack.compression::
1727An integer -1..9, indicating the compression level for objects
1728in a pack file. -1 is the zlib default. 0 means no
1729compression, and 1..9 are various speed/size tradeoffs, 9 being
1730slowest. If not set, defaults to core.compression. If that is
Junio C Hamano2e72a942007-11-21 08:54:421731not set, defaults to -1, the zlib default, which is "a default
1732compromise between speed and compression (currently equivalent
1733to level 6)."
Junio C Hamano657fd8a2010-10-07 00:01:241734+
1735Note that changing the compression level will not automatically recompress
1736all existing objects. You can force recompression by passing the -F option
1737to linkgit:git-repack[1].
Junio C Hamanof2ce2972007-05-20 19:12:091738
Junio C Hamano679d22d2007-06-02 21:13:441739pack.deltaCacheSize::
Junio C Hamanoa6387422007-08-25 03:54:271740The maximum memory in bytes used for caching deltas in
Junio C Hamano9f883862009-08-11 06:23:521741linkgit:git-pack-objects[1] before writing them out to a pack.
1742This cache is used to speed up the writing object phase by not
1743having to recompute the final delta result once the best match
1744for all objects is found. Repacking large repositories on machines
1745which are tight with memory might be badly impacted by this though,
1746especially if this cache pushes the system into swapping.
1747A value of 0 means no limit. The smallest size of 1 byte may be
1748used to virtually disable this cache. Defaults to 256 MiB.
Junio C Hamano679d22d2007-06-02 21:13:441749
1750pack.deltaCacheLimit::
Junio C Hamano58155b42007-09-15 07:46:141751The maximum size of a delta, that is cached in
Junio C Hamano9f883862009-08-11 06:23:521752linkgit:git-pack-objects[1]. This cache is used to speed up the
1753writing object phase by not having to recompute the final delta
1754result once the best match for all objects is found. Defaults to 1000.
Junio C Hamano679d22d2007-06-02 21:13:441755
Junio C Hamano58155b42007-09-15 07:46:141756pack.threads::
1757Specifies the number of threads to spawn when searching for best
Junio C Hamano35738e82008-01-07 07:55:461758delta matches. This requires that linkgit:git-pack-objects[1]
Junio C Hamano58155b42007-09-15 07:46:141759be compiled with pthreads otherwise this option is ignored with a
1760warning. This is meant to reduce packing time on multiprocessor
1761machines. The required amount of memory for the delta search window
1762is however multiplied by the number of threads.
Junio C Hamano076ffcc2013-02-06 05:13:211763Specifying 0 will cause Git to auto-detect the number of CPU's
Junio C Hamano24bc09a2008-02-28 00:27:441764and set the number of threads accordingly.
Junio C Hamano58155b42007-09-15 07:46:141765
Junio C Hamanod814b6d2007-11-04 11:13:491766pack.indexVersion::
1767Specify the default pack index version. Valid values are 1 for
1768legacy pack index used by Git versions prior to 1.5.2, and 2 for
1769the new pack index with capabilities for packs larger than 4 GB
1770as well as proper protection against the repacking of corrupted
Junio C Hamanofce7c7e2008-07-02 03:06:381771packs. Version 2 is the default. Note that version 2 is enforced
1772and this config option ignored whenever the corresponding pack is
1773larger than 2 GB.
1774+
Junio C Hamano076ffcc2013-02-06 05:13:211775If you have an old Git that does not understand the version 2 `*.idx` file,
Junio C Hamanofce7c7e2008-07-02 03:06:381776cloning or fetching over a non native protocol (e.g. "http" and "rsync")
Junio C Hamanob76a6862012-05-02 22:02:461777that will copy both `*.pack` file and corresponding `*.idx` file from the
Junio C Hamanofce7c7e2008-07-02 03:06:381778other side may give you a repository that cannot be accessed with your
Junio C Hamano076ffcc2013-02-06 05:13:211779older version of Git. If the `*.pack` file is smaller than 2 GB, however,
Junio C Hamanofce7c7e2008-07-02 03:06:381780you can use linkgit:git-index-pack[1] on the *.pack file to regenerate
Junio C Hamanob76a6862012-05-02 22:02:461781the `*.idx` file.
Junio C Hamanod814b6d2007-11-04 11:13:491782
Junio C Hamano09a926d2008-03-13 07:55:291783pack.packSizeLimit::
Junio C Hamano4d979582010-02-04 06:27:291784The maximum size of a pack. This setting only affects
1785packing to a file when repacking, i.e. the git:// protocol
Junio C Hamanob76a6862012-05-02 22:02:461786is unaffected. It can be overridden by the `--max-pack-size`
Junio C Hamano4d979582010-02-04 06:27:291787option of linkgit:git-repack[1]. The minimum size allowed is
1788limited to 1 MiB. The default is unlimited.
1789Common unit suffixes of 'k', 'm', or 'g' are
1790supported.
Junio C Hamano49dccaf2008-02-10 10:48:011791
Junio C Hamano9e96a1a2008-08-16 10:23:181792pager.<cmd>::
Junio C Hamano788eeba2010-12-08 22:50:431793If the value is boolean, turns on or off pagination of the
Junio C Hamano076ffcc2013-02-06 05:13:211794output of a particular Git subcommand when writing to a tty.
Junio C Hamano788eeba2010-12-08 22:50:431795Otherwise, turns on pagination for the subcommand using the
Junio C Hamanob76a6862012-05-02 22:02:461796pager specified by the value of `pager.<cmd>`. If `--paginate`
1797or `--no-pager` is specified on the command line, it takes
Junio C Hamano788eeba2010-12-08 22:50:431798precedence over this option. To disable pagination for all
1799commands, set `core.pager` or `GIT_PAGER` to `cat`.
Junio C Hamano9e96a1a2008-08-16 10:23:181800
Junio C Hamanoa574a092010-06-13 19:57:101801pretty.<name>::
1802Alias for a --pretty= format string, as specified in
1803linkgit:git-log[1]. Any aliases defined here can be used just
1804as the built-in pretty formats could. For example,
Junio C Hamanob76a6862012-05-02 22:02:461805running `git config pretty.changelog "format:* %H %s"`
Junio C Hamanoa574a092010-06-13 19:57:101806would cause the invocation `git log --pretty=changelog`
Junio C Hamanob76a6862012-05-02 22:02:461807to be equivalent to running `git log "--pretty=format:* %H %s"`.
Junio C Hamanoa574a092010-06-13 19:57:101808Note that an alias with the same name as a built-in format
1809will be silently ignored.
1810
Junio C Hamano515ab1d2011-12-09 23:41:201811pull.rebase::
1812When true, rebase branches on top of the fetched branch, instead
1813of merging the default branch from the default remote when "git
1814pull" is run. See "branch.<name>.rebase" for setting this on a
1815per-branch basis.
1816+
1817*NOTE*: this is a possibly dangerous operation; do *not* use
1818it unless you understand the implications (see linkgit:git-rebase[1]
1819for details).
1820
Junio C Hamano07824ce2006-04-25 07:36:541821pull.octopus::
1822The default merge strategy to use when pulling multiple branches
1823at once.
1824
1825pull.twohead::
1826The default merge strategy to use when pulling a single branch.
1827
Junio C Hamano1de75722009-03-26 08:39:381828push.default::
Junio C Hamano076ffcc2013-02-06 05:13:211829Defines the action `git push` should take if no refspec is given
Junio C Hamano1de75722009-03-26 08:39:381830on the command line, no refspec is configured in the remote, and
1831no refspec is implied by any of the options given on the command
Junio C Hamano0706c802009-03-30 22:34:191832line. Possible values are:
Junio C Hamano1de75722009-03-26 08:39:381833+
Junio C Hamanobcaa8bc2012-07-03 22:17:201834--
Junio C Hamano7f9fa862010-10-19 23:51:141835* `nothing` - do not push anything.
Junio C Hamanob76a6862012-05-02 22:02:461836* `matching` - push all branches having the same name in both ends.
1837 This is for those who prepare all the branches into a publishable
1838 shape and then push them out with a single command. It is not
1839 appropriate for pushing into a repository shared by multiple users,
1840 since locally stalled branches will attempt a non-fast forward push
1841 if other users updated the branch.
1842 +
1843 This is currently the default, but Git 2.0 will change the default
1844 to `simple`.
Junio C Hamano2da4ac42013-02-19 00:41:171845* `upstream` - push the current branch to its upstream branch
1846 (`tracking` is a deprecated synonym for this).
Junio C Hamanob76a6862012-05-02 22:02:461847 With this, `git push` will update the same remote ref as the one which
1848 is merged by `git pull`, making `push` and `pull` symmetrical.
1849 See "branch.<name>.merge" for how to configure the upstream branch.
1850* `simple` - like `upstream`, but refuses to push if the upstream
1851 branch's name is different from the local one. This is the safest
1852 option and is well-suited for beginners. It will become the default
1853 in Git 2.0.
Junio C Hamano7f9fa862010-10-19 23:51:141854* `current` - push the current branch to a branch of the same name.
Junio C Hamanobcaa8bc2012-07-03 22:17:201855--
1856+
1857The `simple`, `current` and `upstream` modes are for those who want to
1858push out a single branch after finishing work, even when the other
1859branches are not yet ready to be pushed out. If you are working with
1860other people to push into the same shared repository, you would want
1861to use one of these.
Junio C Hamano1de75722009-03-26 08:39:381862
Junio C Hamanoea6a7642009-03-11 23:56:191863rebase.stat::
1864Whether to show a diffstat of what changed upstream since the last
1865rebase. False by default.
1866
Junio C Hamano075ae872010-09-01 18:43:071867rebase.autosquash::
1868If set to true enable '--autosquash' option by default.
1869
Junio C Hamano621e1232009-10-26 05:16:471870receive.autogc::
1871By default, git-receive-pack will run "git-gc --auto" after
1872receiving data from git-push and updating refs. You can stop
1873it by setting this variable to false.
1874
Junio C Hamano4653c6f2008-11-26 22:50:201875receive.fsckObjects::
1876If it is set to true, git-receive-pack will check all received
1877objects. It will abort in the case of a malformed object or a
1878broken link. The result of an abort are only dangling objects.
Junio C Hamano8fb66e52011-10-05 20:59:511879Defaults to false. If not set, the value of `transfer.fsckObjects`
1880is used instead.
Junio C Hamano4653c6f2008-11-26 22:50:201881
1882receive.unpackLimit::
1883If the number of objects received in a push is below this
1884limit then the objects will be unpacked into loose object
1885files. However if the number of received objects equals or
1886exceeds this limit then the received pack will be stored as
1887a pack, after adding any missing delta bases. Storing the
1888pack from a push can make the push operation complete faster,
1889especially on slow filesystems. If not set, the value of
1890`transfer.unpackLimit` is used instead.
1891
1892receive.denyDeletes::
1893If set to true, git-receive-pack will deny a ref update that deletes
1894the ref. Use this to prevent such a ref deletion via a push.
1895
Junio C Hamanob4448a82010-07-26 09:02:321896receive.denyDeleteCurrent::
1897If set to true, git-receive-pack will deny a ref update that
1898deletes the currently checked out branch of a non-bare repository.
1899
Junio C Hamano4653c6f2008-11-26 22:50:201900receive.denyCurrentBranch::
Junio C Hamanoe97d5772010-05-19 08:13:581901If set to true or "refuse", git-receive-pack will deny a ref update
Junio C Hamano4653c6f2008-11-26 22:50:201902to the currently checked out branch of a non-bare repository.
1903Such a push is potentially dangerous because it brings the HEAD
1904out of sync with the index and working tree. If set to "warn",
1905print a warning of such a push to stderr, but allow the push to
1906proceed. If set to false or "ignore", allow such pushes with no
Junio C Hamanoafb395b2010-03-17 22:16:151907message. Defaults to "refuse".
Junio C Hamano4653c6f2008-11-26 22:50:201908
1909receive.denyNonFastForwards::
1910If set to true, git-receive-pack will deny a ref update which is
Junio C Hamano3f680f32009-11-16 02:10:541911not a fast-forward. Use this to prevent such an update via a push,
Junio C Hamano4653c6f2008-11-26 22:50:201912even if that push is forced. This configuration variable is
1913set when initializing a shared repository.
1914
Junio C Hamano80ad00d2013-02-18 00:19:031915receive.hiderefs::
1916String(s) `receive-pack` uses to decide which refs to omit
1917from its initial advertisement. Use more than one
1918definitions to specify multiple prefix strings. A ref that
1919are under the hierarchies listed on the value of this
1920variable is excluded, and is hidden when responding to `git
1921push`, and an attempt to update or delete a hidden ref by
1922`git push` is rejected.
1923
Junio C Hamano621e1232009-10-26 05:16:471924receive.updateserverinfo::
1925If set to true, git-receive-pack will run git-update-server-info
1926after receiving data from git-push and updating refs.
1927
Junio C Hamano63b6fdb2013-04-07 23:37:131928remote.pushdefault::
1929The remote to push to by default. Overrides
1930`branch.<name>.remote` for all branches, and is overridden by
1931`branch.<name>.pushremote` for specific branches.
1932
Junio C Hamano249572f2006-10-24 05:44:081933remote.<name>.url::
Junio C Hamano35738e82008-01-07 07:55:461934The URL of a remote repository. See linkgit:git-fetch[1] or
1935linkgit:git-push[1].
Junio C Hamano249572f2006-10-24 05:44:081936
Junio C Hamano0e88f3e2009-06-21 08:03:251937remote.<name>.pushurl::
1938The push URL of a remote repository. See linkgit:git-push[1].
1939
Junio C Hamano58256872007-12-04 08:31:131940remote.<name>.proxy::
1941For remotes that require curl (http, https and ftp), the URL to
1942the proxy to use for that remote. Set to the empty string to
1943disable proxying for that remote.
1944
Junio C Hamano249572f2006-10-24 05:44:081945remote.<name>.fetch::
Junio C Hamano35738e82008-01-07 07:55:461946The default set of "refspec" for linkgit:git-fetch[1]. See
1947linkgit:git-fetch[1].
Junio C Hamano249572f2006-10-24 05:44:081948
1949remote.<name>.push::
Junio C Hamano35738e82008-01-07 07:55:461950The default set of "refspec" for linkgit:git-push[1]. See
1951linkgit:git-push[1].
Junio C Hamano249572f2006-10-24 05:44:081952
Junio C Hamano47d68a52008-05-06 06:35:401953remote.<name>.mirror::
1954If true, pushing to this remote will automatically behave
Junio C Hamanob76a6862012-05-02 22:02:461955as if the `--mirror` option was given on the command line.
Junio C Hamano47d68a52008-05-06 06:35:401956
Junio C Hamano118d2772007-02-21 20:24:101957remote.<name>.skipDefaultUpdate::
1958If true, this remote will be skipped by default when updating
Junio C Hamano9df0c662009-11-23 11:09:271959using linkgit:git-fetch[1] or the `update` subcommand of
1960linkgit:git-remote[1].
1961
1962remote.<name>.skipFetchAll::
1963If true, this remote will be skipped by default when updating
1964using linkgit:git-fetch[1] or the `update` subcommand of
1965linkgit:git-remote[1].
Junio C Hamano118d2772007-02-21 20:24:101966
Junio C Hamano4ad294b2007-01-20 02:22:501967remote.<name>.receivepack::
Junio C Hamano54ea8d32007-01-25 07:59:481968The default program to execute on the remote side when pushing. See
Junio C Hamano86bcccc2008-03-08 09:33:551969option \--receive-pack of linkgit:git-push[1].
Junio C Hamano4ad294b2007-01-20 02:22:501970
Junio C Hamano54ea8d32007-01-25 07:59:481971remote.<name>.uploadpack::
1972The default program to execute on the remote side when fetching. See
Junio C Hamano86bcccc2008-03-08 09:33:551973option \--upload-pack of linkgit:git-fetch-pack[1].
Junio C Hamano54ea8d32007-01-25 07:59:481974
Junio C Hamano17dde0e2007-02-26 09:50:211975remote.<name>.tagopt::
Junio C Hamano86bcccc2008-03-08 09:33:551976Setting this value to \--no-tags disables automatic tag following when
Junio C Hamanocc7636a2010-05-21 14:57:531977fetching from remote <name>. Setting it to \--tags will fetch every
1978tag from remote <name>, even if they are not reachable from remote
Junio C Hamano075ae872010-09-01 18:43:071979branch heads. Passing these flags directly to linkgit:git-fetch[1] can
1980override this setting. See options \--tags and \--no-tags of
1981linkgit:git-fetch[1].
Junio C Hamano17dde0e2007-02-26 09:50:211982
Junio C Hamano096dde22009-12-26 23:14:111983remote.<name>.vcs::
Junio C Hamano076ffcc2013-02-06 05:13:211984Setting this to a value <vcs> will cause Git to interact with
Junio C Hamano096dde22009-12-26 23:14:111985the remote with the git-remote-<vcs> helper.
1986
Junio C Hamano118d2772007-02-21 20:24:101987remotes.<group>::
1988The list of remotes which are fetched by "git remote update
Junio C Hamano35738e82008-01-07 07:55:461989<group>". See linkgit:git-remote[1].
Junio C Hamano118d2772007-02-21 20:24:101990
Junio C Hamano77b7e902006-10-23 07:18:501991repack.usedeltabaseoffset::
Junio C Hamanofce7c7e2008-07-02 03:06:381992By default, linkgit:git-repack[1] creates packs that use
1993delta-base offset. If you need to share your repository with
Junio C Hamano076ffcc2013-02-06 05:13:211994Git older than version 1.4.4, either directly or via a dumb
Junio C Hamanofce7c7e2008-07-02 03:06:381995protocol such as http, then you need to set this option to
Junio C Hamano076ffcc2013-02-06 05:13:211996"false" and repack. Access from old Git versions over the
Junio C Hamanofce7c7e2008-07-02 03:06:381997native protocol are unaffected by this option.
Junio C Hamano77b7e902006-10-23 07:18:501998
Junio C Hamano4653c6f2008-11-26 22:50:201999rerere.autoupdate::
2000When set to true, `git-rerere` updates the index with the
2001resulting contents after it cleanly resolves conflicts using
2002previously recorded resolution. Defaults to false.
2003
2004rerere.enabled::
2005Activate recording of resolved conflicts, so that identical
Junio C Hamano4fd24422012-01-06 21:52:432006conflict hunks can be resolved automatically, should they be
2007encountered again. By default, linkgit:git-rerere[1] is
2008enabled if there is an `rr-cache` directory under the
Junio C Hamano864ba892012-01-13 17:42:052009`$GIT_DIR`, e.g. if "rerere" was previously used in the
2010repository.
Junio C Hamano4653c6f2008-11-26 22:50:202011
Junio C Hamano1bbd0f42009-07-23 06:20:292012sendemail.identity::
2013A configuration identity. When given, causes values in the
2014'sendemail.<identity>' subsection to take precedence over
2015values in the 'sendemail' section. The default identity is
2016the value of 'sendemail.identity'.
2017
2018sendemail.smtpencryption::
2019See linkgit:git-send-email[1] for description. Note that this
2020setting is not subject to the 'identity' mechanism.
2021
2022sendemail.smtpssl::
2023Deprecated alias for 'sendemail.smtpencryption = ssl'.
2024
2025sendemail.<identity>.*::
2026Identity-specific versions of the 'sendemail.*' parameters
2027found below, taking precedence over those when the this
2028identity is selected, through command-line or
2029'sendemail.identity'.
2030
2031sendemail.aliasesfile::
2032sendemail.aliasfiletype::
Junio C Hamanoea3b7522013-04-18 19:37:532033sendemail.annotate::
Junio C Hamano1bbd0f42009-07-23 06:20:292034sendemail.bcc::
2035sendemail.cc::
2036sendemail.cccmd::
2037sendemail.chainreplyto::
2038sendemail.confirm::
2039sendemail.envelopesender::
2040sendemail.from::
2041sendemail.multiedit::
2042sendemail.signedoffbycc::
2043sendemail.smtppass::
2044sendemail.suppresscc::
2045sendemail.suppressfrom::
2046sendemail.to::
Junio C Hamanocb39aea2010-05-09 07:24:482047sendemail.smtpdomain::
Junio C Hamano1bbd0f42009-07-23 06:20:292048sendemail.smtpserver::
2049sendemail.smtpserverport::
Junio C Hamano39c7a692010-10-27 06:08:542050sendemail.smtpserveroption::
Junio C Hamano1bbd0f42009-07-23 06:20:292051sendemail.smtpuser::
2052sendemail.thread::
2053sendemail.validate::
2054See linkgit:git-send-email[1] for description.
2055
2056sendemail.signedoffcc::
2057Deprecated alias for 'sendemail.signedoffbycc'.
2058
Junio C Hamano07824ce2006-04-25 07:36:542059showbranch.default::
Junio C Hamano35738e82008-01-07 07:55:462060The default set of branches for linkgit:git-show-branch[1].
2061See linkgit:git-show-branch[1].
Junio C Hamano07824ce2006-04-25 07:36:542062
Junio C Hamano942b35e2007-12-09 10:19:332063status.relativePaths::
Junio C Hamano35738e82008-01-07 07:55:462064By default, linkgit:git-status[1] shows paths relative to the
Junio C Hamano942b35e2007-12-09 10:19:332065current directory. Setting this variable to `false` shows paths
Junio C Hamano076ffcc2013-02-06 05:13:212066relative to the repository root (this was the default for Git
Junio C Hamano942b35e2007-12-09 10:19:332067prior to v1.5.4).
2068
Junio C Hamano4224f992008-06-23 07:14:082069status.showUntrackedFiles::
2070By default, linkgit:git-status[1] and linkgit:git-commit[1] show
2071files which are not currently tracked by Git. Directories which
2072contain only untracked files, are shown with the directory name
2073only. Showing untracked files means that Git needs to lstat() all
2074all the files in the whole repository, which might be slow on some
2075systems. So, this variable controls how the commands displays
2076the untracked files. Possible values are:
2077+
2078--
Junio C Hamano7f9fa862010-10-19 23:51:142079* `no` - Show no untracked files.
2080* `normal` - Show untracked files and directories.
2081* `all` - Show also individual files in untracked directories.
Junio C Hamano4224f992008-06-23 07:14:082082--
2083+
2084If this variable is not specified, it defaults to 'normal'.
2085This variable can be overridden with the -u|--untracked-files option
2086of linkgit:git-status[1] and linkgit:git-commit[1].
2087
Junio C Hamanob671fb52010-06-01 05:06:142088status.submodulesummary::
2089Defaults to false.
2090If this is set to a non zero number or true (identical to -1 or an
2091unlimited number), the submodule summary will be enabled and a
2092summary of commits for modified submodules will be shown (see
2093--summary-limit option of linkgit:git-submodule[1]).
2094
Junio C Hamano78e3a782010-07-15 22:24:452095submodule.<name>.path::
2096submodule.<name>.url::
2097submodule.<name>.update::
2098The path within this project, URL, and the updating strategy
2099for a submodule. These variables are initially populated
2100by 'git submodule init'; edit them to override the
2101URL and other values found in the `.gitmodules` file. See
2102linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
2103
Junio C Hamanoabad6da2013-01-06 09:06:322104submodule.<name>.branch::
2105The remote branch name for a submodule, used by `git submodule
2106update --remote`. Set this option to override the value found in
2107the `.gitmodules` file. See linkgit:git-submodule[1] and
2108linkgit:gitmodules[5] for details.
2109
Junio C Hamano0d75e872010-12-17 06:57:262110submodule.<name>.fetchRecurseSubmodules::
Junio C Hamano5cd15182011-04-05 00:21:102111This option can be used to control recursive fetching of this
Junio C Hamano7165bf72011-01-04 22:06:182112submodule. It can be overridden by using the --[no-]recurse-submodules
Junio C Hamano0d75e872010-12-17 06:57:262113command line option to "git fetch" and "git pull".
2114This setting will override that from in the linkgit:gitmodules[5]
2115file.
2116
Junio C Hamano619596a2010-08-18 22:15:352117submodule.<name>.ignore::
2118Defines under what circumstances "git status" and the diff family show
2119a submodule as modified. When set to "all", it will never be considered
2120modified, "dirty" will ignore all changes to the submodules work tree and
2121takes only differences between the HEAD of the submodule and the commit
2122recorded in the superproject into account. "untracked" will additionally
2123let submodules with modified tracked files in their work tree show up.
2124Using "none" (the default when this option is not set) also shows
2125submodules that have untracked files in their work tree as changed.
2126This setting overrides any setting made in .gitmodules for this submodule,
Junio C Hamanode9745c2010-08-23 17:10:182127both settings can be overridden on the command line by using the
Junio C Hamano619596a2010-08-18 22:15:352128"--ignore-submodules" option.
2129
Junio C Hamano75cc4c92006-07-24 08:25:032130tar.umask::
Junio C Hamanobdebabb2007-08-23 00:25:092131This variable can be used to restrict the permission bits of
2132tar archive entries. The default is 0002, which turns off the
2133world write bit. The special value "user" indicates that the
2134archiving user's umask will be used instead. See umask(2) and
Junio C Hamano35738e82008-01-07 07:55:462135linkgit:git-archive[1].
Junio C Hamano75cc4c92006-07-24 08:25:032136
Junio C Hamano8fb66e52011-10-05 20:59:512137transfer.fsckObjects::
2138When `fetch.fsckObjects` or `receive.fsckObjects` are
2139not set, the value of this variable is used instead.
2140Defaults to false.
2141
Junio C Hamano80ad00d2013-02-18 00:19:032142transfer.hiderefs::
2143This variable can be used to set both `receive.hiderefs`
2144and `uploadpack.hiderefs` at the same time to the same
2145values. See entries for these other variables.
2146
Junio C Hamano4653c6f2008-11-26 22:50:202147transfer.unpackLimit::
2148When `fetch.unpackLimit` or `receive.unpackLimit` are
2149not set, the value of this variable is used instead.
2150The default value is 100.
2151
Junio C Hamano80ad00d2013-02-18 00:19:032152uploadpack.hiderefs::
2153String(s) `upload-pack` uses to decide which refs to omit
2154from its initial advertisement. Use more than one
2155definitions to specify multiple prefix strings. A ref that
2156are under the hierarchies listed on the value of this
2157variable is excluded, and is hidden from `git ls-remote`,
2158`git fetch`, etc. An attempt to fetch a hidden ref by `git
Junio C Hamano5e7f1312013-03-21 22:49:012159fetch` will fail. See also `uploadpack.allowtipsha1inwant`.
2160
2161uploadpack.allowtipsha1inwant::
2162When `uploadpack.hiderefs` is in effect, allow `upload-pack`
2163to accept a fetch request that asks for an object at the tip
2164of a hidden ref (by default, such a request is rejected).
2165see also `uploadpack.hiderefs`.
Junio C Hamano80ad00d2013-02-18 00:19:032166
Junio C Hamano24bc09a2008-02-28 00:27:442167url.<base>.insteadOf::
2168Any URL that starts with this value will be rewritten to
2169start, instead, with <base>. In cases where some site serves a
2170large number of repositories, and serves them with multiple
2171access methods, and some users need to use different access
2172methods, this feature allows people to specify any of the
Junio C Hamano076ffcc2013-02-06 05:13:212173equivalent URLs and have Git automatically rewrite the URL to
Junio C Hamano24bc09a2008-02-28 00:27:442174the best alternative for the particular user, even for a
2175never-before-seen repository on the site. When more than one
2176insteadOf strings match a given URL, the longest match is used.
2177
Junio C Hamano7df6dcf2009-09-13 09:51:172178url.<base>.pushInsteadOf::
2179Any URL that starts with this value will not be pushed to;
2180instead, it will be rewritten to start with <base>, and the
2181resulting URL will be pushed to. In cases where some site serves
2182a large number of repositories, and serves them with multiple
2183access methods, some of which do not allow push, this feature
Junio C Hamano076ffcc2013-02-06 05:13:212184allows people to specify a pull-only URL and have Git
Junio C Hamano7df6dcf2009-09-13 09:51:172185automatically use an appropriate URL to push, even for a
2186never-before-seen repository on the site. When more than one
2187pushInsteadOf strings match a given URL, the longest match is
Junio C Hamano076ffcc2013-02-06 05:13:212188used. If a remote has an explicit pushurl, Git will ignore this
Junio C Hamano7df6dcf2009-09-13 09:51:172189setting for that remote.
2190
Junio C Hamano07824ce2006-04-25 07:36:542191user.email::
2192Your email address to be recorded in any newly created commits.
Junio C Hamano469d60e2007-04-29 18:30:342193Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
Junio C Hamano35738e82008-01-07 07:55:462194'EMAIL' environment variables. See linkgit:git-commit-tree[1].
Junio C Hamano07824ce2006-04-25 07:36:542195
2196user.name::
2197Your full name to be recorded in any newly created commits.
Junio C Hamano341071d2006-06-04 07:24:482198Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
Junio C Hamano35738e82008-01-07 07:55:462199environment variables. See linkgit:git-commit-tree[1].
Junio C Hamano07824ce2006-04-25 07:36:542200
Junio C Hamanoa890c4f2007-01-28 10:29:212201user.signingkey::
Junio C Hamano35738e82008-01-07 07:55:462202If linkgit:git-tag[1] is not selecting the key you want it to
Junio C Hamanoa890c4f2007-01-28 10:29:212203automatically when creating a signed tag, you can override the
2204default selection with this variable. This option is passed
2205unchanged to gpg's --local-user parameter, so you may specify a key
2206using any method that gpg supports.
2207
Junio C Hamano4e272312008-01-08 09:13:212208web.browser::
2209Specify a web browser that may be used by some commands.
2210Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
2211may use it.