Updated git_doc to git 1.8

[TortoiseGit.git] / doc / source / en / TortoiseGit / git_doc / git-config.xml

<?xml version="1.0" encoding="UTF-8"?>\r
<!DOCTYPE sect2 PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">\r
\r
<sect2 lang="en" id="git-config(1)">\r
    <title>git-config(1)</title>\r
<indexterm>\r
<primary>git-config(1)</primary>\r
</indexterm>\r
<simplesect id="git-config(1)__name">\r
<title>NAME</title>\r
<simpara>git-config - Get and set repository or global options</simpara>\r
</simplesect>\r
<simplesect id="git-config(1)__synopsis">\r
<title>SYNOPSIS</title>\r
<blockquote>\r
<literallayout><emphasis>git config</emphasis> [&lt;file-option&gt;] [type] [-z|--null] name [value [value_regex]]\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] [type] --add name value\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] [type] --replace-all name value [value_regex]\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] [type] [-z|--null] --get name [value_regex]\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] [type] [-z|--null] --get-all name [value_regex]\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] [type] [-z|--null] --get-regexp name_regex [value_regex]\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] --unset name [value_regex]\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] --unset-all name [value_regex]\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] --rename-section old_name new_name\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] --remove-section name\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] [-z|--null] -l | --list\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] --get-color name [default]\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] --get-colorbool name [stdout-is-tty]\r
<emphasis>git config</emphasis> [&lt;file-option&gt;] -e | --edit</literallayout>\r
</blockquote>\r
</simplesect>\r
<simplesect id="git-config(1)__description">\r
<title>DESCRIPTION</title>\r
<simpara>You can query/set/replace/unset options with this command. The name is\r
actually the section and the key separated by a dot, and the value will be\r
escaped.</simpara>\r
<simpara>Multiple lines can be added to an option by using the <emphasis>--add</emphasis> option.\r
If you want to update or unset an option which can occur on multiple\r
lines, a POSIX regexp <emphasis>value_regex</emphasis> needs to be given.  Only the\r
existing values that match the regexp are updated or unset.  If\r
you want to handle the lines that do <emphasis role="strong">not</emphasis> match the regex, just\r
prepend a single exclamation mark in front (see also <xref linkend="git-config(1)_EXAMPLES"/>).</simpara>\r
<simpara>The type specifier can be either <emphasis>--int</emphasis> or <emphasis>--bool</emphasis>, to make\r
<emphasis>git config</emphasis> ensure that the variable(s) are of the given type and\r
convert the value to the canonical form (simple decimal number for int,\r
a "true" or "false" string for bool), or <emphasis>--path</emphasis>, which does some\r
path expansion (see <emphasis>--path</emphasis> below).  If no type specifier is passed, no\r
checks or transformations are performed on the value.</simpara>\r
<simpara>When reading, the values are read from the system, global and\r
repository local configuration files by default, and options\r
<emphasis>--system</emphasis>, <emphasis>--global</emphasis>, <emphasis>--local</emphasis> and <emphasis>--file &lt;filename&gt;</emphasis> can be\r
used to tell the command to read from only that location (see <xref linkend="git-config(1)_FILES"/>).</simpara>\r
<simpara>When writing, the new value is written to the repository local\r
configuration file by default, and options <emphasis>--system</emphasis>, <emphasis>--global</emphasis>,\r
<emphasis>--file &lt;filename&gt;</emphasis> can be used to tell the command to write to\r
that location (you can say <emphasis>--local</emphasis> but that is the default).</simpara>\r
<simpara>This command will fail with non-zero status upon error.  Some exit\r
codes are:</simpara>\r
<orderedlist numeration="arabic">\r
<listitem>\r
<simpara>\r
The config file is invalid (ret=3),\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
can not write to the config file (ret=4),\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
no section or name was provided (ret=2),\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
the section or key is invalid (ret=1),\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
you try to unset an option which does not exist (ret=5),\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
you try to unset/set an option for which multiple lines match (ret=5), or\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
you try to use an invalid regexp (ret=6).\r
</simpara>\r
</listitem>\r
</orderedlist>\r
<simpara>On success, the command returns the exit code 0.</simpara>\r
</simplesect>\r
<simplesect id="git-config(1)__options">\r
<title>OPTIONS</title>\r
<variablelist>\r
<varlistentry>\r
<term>\r
--replace-all\r
</term>\r
<listitem>\r
<simpara>\r
        Default behavior is to replace at most one line. This replaces\r
        all lines matching the key (and optionally the value_regex).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--add\r
</term>\r
<listitem>\r
<simpara>\r
        Adds a new line to the option without altering any existing\r
        values.  This is the same as providing <emphasis>^$</emphasis> as the value_regex\r
        in <emphasis>--replace-all</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--get\r
</term>\r
<listitem>\r
<simpara>\r
        Get the value for a given key (optionally filtered by a regex\r
        matching the value). Returns error code 1 if the key was not\r
        found and error code 2 if multiple key values were found.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--get-all\r
</term>\r
<listitem>\r
<simpara>\r
        Like get, but does not fail if the number of values for the key\r
        is not exactly one.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--get-regexp\r
</term>\r
<listitem>\r
<simpara>\r
        Like --get-all, but interprets the name as a regular expression and\r
        writes out the key names.  Regular expression matching is currently\r
        case-sensitive and done against a canonicalized version of the key\r
        in which section and variable names are lowercased, but subsection\r
        names are not.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--global\r
</term>\r
<listitem>\r
<simpara>\r
        For writing options: write to global <subscript>/.gitconfig file rather than\r
        the repository .git/config, write to $XDG_CONFIG_HOME/git/config file\r
        if this file exists and the </subscript>/.gitconfig file doesn't.\r
</simpara>\r
<simpara>For reading options: read only from global ~/.gitconfig and from\r
$XDG_CONFIG_HOME/git/config rather than from all available files.</simpara>\r
<simpara>See also <xref linkend="git-config(1)_FILES"/>.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--system\r
</term>\r
<listitem>\r
<simpara>\r
        For writing options: write to system-wide $(prefix)/etc/gitconfig\r
        rather than the repository .git/config.\r
</simpara>\r
<simpara>For reading options: read only from system-wide $(prefix)/etc/gitconfig\r
rather than from all available files.</simpara>\r
<simpara>See also <xref linkend="git-config(1)_FILES"/>.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
-f config-file\r
</term>\r
<term>\r
--file config-file\r
</term>\r
<listitem>\r
<simpara>\r
        Use the given config file instead of the one specified by GIT_CONFIG.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--remove-section\r
</term>\r
<listitem>\r
<simpara>\r
        Remove the given section from the configuration file.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--rename-section\r
</term>\r
<listitem>\r
<simpara>\r
        Rename the given section to a new name.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--unset\r
</term>\r
<listitem>\r
<simpara>\r
        Remove the line matching the key from config file.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--unset-all\r
</term>\r
<listitem>\r
<simpara>\r
        Remove all lines matching the key from config file.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
-l\r
</term>\r
<term>\r
--list\r
</term>\r
<listitem>\r
<simpara>\r
        List all variables set in config file.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--bool\r
</term>\r
<listitem>\r
<simpara>\r
        <emphasis>git config</emphasis> will ensure that the output is "true" or "false"\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--int\r
</term>\r
<listitem>\r
<simpara>\r
        <emphasis>git config</emphasis> will ensure that the output is a simple\r
        decimal number.  An optional value suffix of <emphasis>k</emphasis>, <emphasis>m</emphasis>, or <emphasis>g</emphasis>\r
        in the config file will cause the value to be multiplied\r
        by 1024, 1048576, or 1073741824 prior to output.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--bool-or-int\r
</term>\r
<listitem>\r
<simpara>\r
        <emphasis>git config</emphasis> will ensure that the output matches the format of\r
        either --bool or --int, as described above.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--path\r
</term>\r
<listitem>\r
<simpara>\r
        <emphasis>git-config</emphasis> will expand leading <emphasis>&#126;</emphasis> to the value of\r
        <emphasis>$HOME</emphasis>, and <emphasis>&#126;user</emphasis> to the home directory for the\r
        specified user.  This option has no effect when setting the\r
        value (but you can use <emphasis>git config bla &#126;/</emphasis> from the\r
        command line to let your shell do the expansion).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
-z\r
</term>\r
<term>\r
--null\r
</term>\r
<listitem>\r
<simpara>\r
        For all options that output values and/or keys, always\r
        end values with the null character (instead of a\r
        newline). Use newline instead as a delimiter between\r
        key and value. This allows for secure parsing of the\r
        output without getting confused e.g. by values that\r
        contain line breaks.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--get-colorbool name [stdout-is-tty]\r
</term>\r
<listitem>\r
<simpara>\r
        Find the color setting for <emphasis>name</emphasis> (e.g. <emphasis>color.diff</emphasis>) and output\r
        "true" or "false".  <emphasis>stdout-is-tty</emphasis> should be either "true" or\r
        "false", and is taken into account when configuration says\r
        "auto".  If <emphasis>stdout-is-tty</emphasis> is missing, then checks the standard\r
        output of the command itself, and exits with status 0 if color\r
        is to be used, or exits with status 1 otherwise.\r
        When the color setting for <emphasis>name</emphasis> is undefined, the command uses\r
        <emphasis>color.ui</emphasis> as fallback.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--get-color name [default]\r
</term>\r
<listitem>\r
<simpara>\r
        Find the color configured for <emphasis>name</emphasis> (e.g. <emphasis>color.diff.new</emphasis>) and\r
        output it as the ANSI color escape sequence to the standard\r
        output.  The optional <emphasis>default</emphasis> parameter is used instead, if\r
        there is no color configured for <emphasis>name</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
-e\r
</term>\r
<term>\r
--edit\r
</term>\r
<listitem>\r
<simpara>\r
        Opens an editor to modify the specified config file; either\r
        <emphasis>--system</emphasis>, <emphasis>--global</emphasis>, or repository (default).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
--includes\r
</term>\r
<term>\r
--no-includes\r
</term>\r
<listitem>\r
<simpara>\r
        Respect <emphasis>include.*</emphasis> directives in config files when looking up\r
        values. Defaults to on.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
</simplesect>\r
<simplesect id="git-config(1)_FILES">\r
<title>FILES</title>\r
<simpara>If not set explicitly with <emphasis>--file</emphasis>, there are four files where\r
<emphasis>git config</emphasis> will search for configuration options:</simpara>\r
<variablelist>\r
<varlistentry>\r
<term>\r
$GIT_DIR/config\r
</term>\r
<listitem>\r
<simpara>\r
        Repository specific configuration file.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
~/.gitconfig\r
</term>\r
<listitem>\r
<simpara>\r
        User-specific configuration file. Also called "global"\r
        configuration file.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
$XDG_CONFIG_HOME/git/config\r
</term>\r
<listitem>\r
<simpara>\r
        Second user-specific configuration file. If $XDG_CONFIG_HOME is not set\r
        or empty, $HOME/.config/git/config will be used. Any single-valued\r
        variable set in this file will be overwritten by whatever is in\r
        ~/.gitconfig.  It is a good idea not to create this file if\r
        you sometimes use older versions of Git, as support for this\r
        file was added fairly recently.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
$(prefix)/etc/gitconfig\r
</term>\r
<listitem>\r
<simpara>\r
        System-wide configuration file.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
<simpara>If no further options are given, all reading options will read all of these\r
files that are available. If the global or the system-wide configuration\r
file are not available they will be ignored. If the repository configuration\r
file is not available or readable, <emphasis>git config</emphasis> will exit with a non-zero\r
error code. However, in neither case will an error message be issued.</simpara>\r
<simpara>All writing options will per default write to the repository specific\r
configuration file. Note that this also affects options like <emphasis>--replace-all</emphasis>\r
and <emphasis>--unset</emphasis>. <emphasis role="strong"><emphasis>git config</emphasis> will only ever change one file at a time</emphasis>.</simpara>\r
<simpara>You can override these rules either by command line options or by environment\r
variables. The <emphasis>--global</emphasis> and the <emphasis>--system</emphasis> options will limit the file used\r
to the global or system-wide file respectively. The GIT_CONFIG environment\r
variable has a similar effect, but you can specify any filename you want.</simpara>\r
</simplesect>\r
<simplesect id="git-config(1)__environment">\r
<title>ENVIRONMENT</title>\r
<variablelist>\r
<varlistentry>\r
<term>\r
GIT_CONFIG\r
</term>\r
<listitem>\r
<simpara>\r
        Take the configuration from the given file instead of .git/config.\r
        Using the "--global" option forces this to ~/.gitconfig. Using the\r
        "--system" option forces this to $(prefix)/etc/gitconfig.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
<simpara>See also <xref linkend="git-config(1)_FILES"/>.</simpara>\r
</simplesect>\r
<simplesect id="git-config(1)_EXAMPLES">\r
<title>EXAMPLES</title>\r
<simpara>Given a .git/config like this:</simpara>\r
<literallayout class="monospaced">#\r
# This is the config file, and\r
# a '#' or ';' character indicates\r
# a comment\r
#</literallayout>\r
<literallayout class="monospaced">; core variables\r
[core]\r
        ; Don't trust file modes\r
        filemode = false</literallayout>\r
<literallayout class="monospaced">; Our diff algorithm\r
[diff]\r
        external = /usr/local/bin/diff-wrapper\r
        renames = true</literallayout>\r
<literallayout class="monospaced">; Proxy settings\r
[core]\r
        gitproxy=proxy-command for kernel.org\r
        gitproxy=default-proxy ; for all the rest</literallayout>\r
<simpara>you can set the filemode to true with</simpara>\r
<screen>% git config core.filemode true</screen>\r
<simpara>The hypothetical proxy command entries actually have a postfix to discern\r
what URL they apply to. Here is how to change the entry for kernel.org\r
to "ssh".</simpara>\r
<screen>% git config core.gitproxy '"ssh" for kernel.org' 'for kernel.org$'</screen>\r
<simpara>This makes sure that only the key/value pair for kernel.org is replaced.</simpara>\r
<simpara>To delete the entry for renames, do</simpara>\r
<screen>% git config --unset diff.renames</screen>\r
<simpara>If you want to delete an entry for a multivar (like core.gitproxy above),\r
you have to provide a regex matching the value of exactly one line.</simpara>\r
<simpara>To query the value for a given key, do</simpara>\r
<screen>% git config --get core.filemode</screen>\r
<simpara>or</simpara>\r
<screen>% git config core.filemode</screen>\r
<simpara>or, to query a multivar:</simpara>\r
<screen>% git config --get core.gitproxy "for kernel.org$"</screen>\r
<simpara>If you want to know all the values for a multivar, do:</simpara>\r
<screen>% git config --get-all core.gitproxy</screen>\r
<simpara>If you like to live dangerously, you can replace <emphasis role="strong">all</emphasis> core.gitproxy by a\r
new one with</simpara>\r
<screen>% git config --replace-all core.gitproxy ssh</screen>\r
<simpara>However, if you really only want to replace the line for the default proxy,\r
i.e. the one without a "for &#8230;" postfix, do something like this:</simpara>\r
<screen>% git config core.gitproxy ssh '! for '</screen>\r
<simpara>To actually match only values with an exclamation mark, you have to</simpara>\r
<screen>% git config section.key value '[!]'</screen>\r
<simpara>To add a new proxy, without altering any of the existing ones, use</simpara>\r
<screen>% git config --add core.gitproxy '"proxy-command" for example.com'</screen>\r
<simpara>An example to use customized color from the configuration in your\r
script:</simpara>\r
<screen>#!/bin/sh\r
WS=$(git config --get-color color.diff.whitespace "blue reverse")\r
RESET=$(git config --get-color "" "reset")\r
echo "${WS}your whitespace color or blue reverse${RESET}"</screen>\r
</simplesect>\r
<simplesect id="git-config(1)__configuration_file">\r
<title>CONFIGURATION FILE</title>\r
<simpara>The git configuration file contains a number of variables that affect\r
the git command's behavior. The <emphasis>.git/config</emphasis> file in each repository\r
is used to store the configuration for that repository, and\r
<emphasis>$HOME/.gitconfig</emphasis> is used to store a per-user configuration as\r
fallback values for the <emphasis>.git/config</emphasis> file. The file <emphasis>/etc/gitconfig</emphasis>\r
can be used to store a system-wide default configuration.</simpara>\r
<simpara>The configuration variables are used by both the git plumbing\r
and the porcelains. The variables are divided into sections, wherein\r
the fully qualified variable name of the variable itself is the last\r
dot-separated segment and the section name is everything before the last\r
dot. The variable names are case-insensitive, allow only alphanumeric\r
characters and <emphasis>-</emphasis>, and must start with an alphabetic character.  Some\r
variables may appear multiple times.</simpara>\r
<section id="git-config(1)__syntax">\r
<title>Syntax</title>\r
<simpara>The syntax is fairly flexible and permissive; whitespaces are mostly\r
ignored.  The <emphasis>#</emphasis> and <emphasis>;</emphasis> characters begin comments to the end of line,\r
blank lines are ignored.</simpara>\r
<simpara>The file consists of sections and variables.  A section begins with\r
the name of the section in square brackets and continues until the next\r
section begins.  Section names are not case sensitive.  Only alphanumeric\r
characters, <emphasis>-</emphasis> and <emphasis>.</emphasis> are allowed in section names.  Each variable\r
must belong to some section, which means that there must be a section\r
header before the first setting of a variable.</simpara>\r
<simpara>Sections can be further divided into subsections.  To begin a subsection\r
put its name in double quotes, separated by space from the section name,\r
in the section header, like in the example below:</simpara>\r
<screen>        [section "subsection"]</screen>\r
<simpara>Subsection names are case sensitive and can contain any characters except\r
newline (doublequote <emphasis>"</emphasis> and backslash have to be escaped as <emphasis>\"</emphasis> and <emphasis>\\</emphasis>,\r
respectively).  Section headers cannot span multiple\r
lines.  Variables may belong directly to a section or to a given subsection.\r
You can have <emphasis>[section]</emphasis> if you have <emphasis>[section "subsection"]</emphasis>, but you\r
don't need to.</simpara>\r
<simpara>There is also a deprecated <emphasis>[section.subsection]</emphasis> syntax. With this\r
syntax, the subsection name is converted to lower-case and is also\r
compared case sensitively. These subsection names follow the same\r
restrictions as section names.</simpara>\r
<simpara>All the other lines (and the remainder of the line after the section\r
header) are recognized as setting variables, in the form\r
<emphasis>name = value</emphasis>.  If there is no equal sign on the line, the entire line\r
is taken as <emphasis>name</emphasis> and the variable is recognized as boolean "true".\r
The variable names are case-insensitive, allow only alphanumeric characters\r
and <emphasis>-</emphasis>, and must start with an alphabetic character.  There can be more\r
than one value for a given variable; we say then that the variable is\r
multivalued.</simpara>\r
<simpara>Leading and trailing whitespace in a variable value is discarded.\r
Internal whitespace within a variable value is retained verbatim.</simpara>\r
<simpara>The values following the equals sign in variable assign are all either\r
a string, an integer, or a boolean.  Boolean values may be given as yes/no,\r
1/0, true/false or on/off.  Case is not significant in boolean values, when\r
converting value to the canonical form using <emphasis>--bool</emphasis> type specifier;\r
<emphasis>git config</emphasis> will ensure that the output is "true" or "false".</simpara>\r
<simpara>String values may be entirely or partially enclosed in double quotes.\r
You need to enclose variable values in double quotes if you want to\r
preserve leading or trailing whitespace, or if the variable value contains\r
comment characters (i.e. it contains <emphasis>#</emphasis> or <emphasis>;</emphasis>).\r
Double quote <emphasis>"</emphasis> and backslash <emphasis>\</emphasis> characters in variable values must\r
be escaped: use <emphasis>\"</emphasis> for <emphasis>"</emphasis> and <emphasis>\\</emphasis> for <emphasis>\</emphasis>.</simpara>\r
<simpara>The following escape sequences (beside <emphasis>\"</emphasis> and <emphasis>\\</emphasis>) are recognized:\r
<emphasis>\n</emphasis> for newline character (NL), <emphasis>\t</emphasis> for horizontal tabulation (HT, TAB)\r
and <emphasis>\b</emphasis> for backspace (BS).  No other char escape sequence, nor octal\r
char sequences are valid.</simpara>\r
<simpara>Variable values ending in a <emphasis>\</emphasis> are continued on the next line in the\r
customary UNIX fashion.</simpara>\r
<simpara>Some variables may require a special value format.</simpara>\r
</section>\r
<section id="git-config(1)__includes">\r
<title>Includes</title>\r
<simpara>You can include one config file from another by setting the special\r
<emphasis>include.path</emphasis> variable to the name of the file to be included. The\r
included file is expanded immediately, as if its contents had been\r
found at the location of the include directive. If the value of the\r
<emphasis>include.path</emphasis> variable is a relative path, the path is considered to be\r
relative to the configuration file in which the include directive was\r
found. The value of <emphasis>include.path</emphasis> is subject to tilde expansion: <emphasis>~/</emphasis>\r
is expanded to the value of <emphasis>$HOME</emphasis>, and <emphasis>~user/</emphasis> to the specified\r
user's home directory. See below for examples.</simpara>\r
</section>\r
<section id="git-config(1)__example">\r
<title>Example</title>\r
<literallayout class="monospaced"># Core variables\r
[core]\r
        ; Don't trust file modes\r
        filemode = false</literallayout>\r
<literallayout class="monospaced"># Our diff algorithm\r
[diff]\r
        external = /usr/local/bin/diff-wrapper\r
        renames = true</literallayout>\r
<literallayout class="monospaced">[branch "devel"]\r
        remote = origin\r
        merge = refs/heads/devel</literallayout>\r
<literallayout class="monospaced"># Proxy settings\r
[core]\r
        gitProxy="ssh" for "kernel.org"\r
        gitProxy=default-proxy ; for the rest</literallayout>\r
<literallayout class="monospaced">[include]\r
        path = /path/to/foo.inc ; include by absolute path\r
        path = foo ; expand "foo" relative to the current file\r
        path = ~/foo ; expand "foo" in your $HOME directory</literallayout>\r
</section>\r
<section id="git-config(1)__variables">\r
<title>Variables</title>\r
<simpara>Note that this list is non-comprehensive and not necessarily complete.\r
For command-specific variables, you will find a more detailed description\r
in the appropriate manual page. You will find a description of non-core\r
porcelain configuration variables in the respective porcelain documentation.</simpara>\r
<variablelist>\r
<varlistentry>\r
<term>\r
advice.*\r
</term>\r
<listitem>\r
<simpara>\r
        These variables control various optional help messages designed to\r
        aid new users. All <emphasis>advice.*</emphasis> variables default to <emphasis>true</emphasis>, and you\r
        can tell Git that you do not need help by setting these to <emphasis>false</emphasis>:\r
</simpara>\r
<variablelist>\r
<varlistentry>\r
<term>\r
pushNonFastForward\r
</term>\r
<listitem>\r
<simpara>\r
                Set this variable to <emphasis>false</emphasis> if you want to disable\r
                <emphasis>pushNonFFCurrent</emphasis>, <emphasis>pushNonFFDefault</emphasis>, and\r
                <emphasis>pushNonFFMatching</emphasis> simultaneously.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pushNonFFCurrent\r
</term>\r
<listitem>\r
<simpara>\r
                Advice shown when <xref linkend="git-push(1)" /> fails due to a\r
                non-fast-forward update to the current branch.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pushNonFFDefault\r
</term>\r
<listitem>\r
<simpara>\r
                Advice to set <emphasis>push.default</emphasis> to <emphasis>upstream</emphasis> or <emphasis>current</emphasis>\r
                when you ran <xref linkend="git-push(1)" /> and pushed <emphasis>matching\r
                refs</emphasis> by default (i.e. you did not provide an explicit\r
                refspec, and no <emphasis>push.default</emphasis> configuration was set)\r
                and it resulted in a non-fast-forward error.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pushNonFFMatching\r
</term>\r
<listitem>\r
<simpara>\r
                Advice shown when you ran <xref linkend="git-push(1)" /> and pushed\r
                <emphasis>matching refs</emphasis> explicitly (i.e. you used <emphasis>:</emphasis>, or\r
                specified a refspec that isn't your current branch) and\r
                it resulted in a non-fast-forward error.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
statusHints\r
</term>\r
<listitem>\r
<simpara>\r
                Show directions on how to proceed from the current\r
                state in the output of <xref linkend="git-status(1)" />, in\r
                the template shown when writing commit messages in\r
                <xref linkend="git-commit(1)" />, and in the help message shown\r
                by <xref linkend="git-checkout(1)" /> when switching branch.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
commitBeforeMerge\r
</term>\r
<listitem>\r
<simpara>\r
                Advice shown when <xref linkend="git-merge(1)" /> refuses to\r
                merge to avoid overwriting local changes.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
resolveConflict\r
</term>\r
<listitem>\r
<simpara>\r
                Advices shown by various commands when conflicts\r
                prevent the operation from being performed.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
implicitIdentity\r
</term>\r
<listitem>\r
<simpara>\r
                Advice on how to set your identity configuration when\r
                your information is guessed from the system username and\r
                domain name.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
detachedHead\r
</term>\r
<listitem>\r
<simpara>\r
                Advice shown when you used <xref linkend="git-checkout(1)" /> to\r
                move to the detach HEAD state, to instruct how to create\r
                a local branch after the fact.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
amWorkDir\r
</term>\r
<listitem>\r
<simpara>\r
                Advice that shows the location of the patch file when\r
                <xref linkend="git-am(1)" /> fails to apply it.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.fileMode\r
</term>\r
<listitem>\r
<simpara>\r
        If false, the executable bit differences between the index and\r
        the working tree are ignored; useful on broken filesystems like FAT.\r
        See <xref linkend="git-update-index(1)" />.\r
</simpara>\r
<simpara>The default is true, except <xref linkend="git-clone(1)" /> or <xref linkend="git-init(1)" />\r
will probe and set core.fileMode false if appropriate when the\r
repository is created.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.ignoreCygwinFSTricks\r
</term>\r
<listitem>\r
<simpara>\r
        This option is only used by Cygwin implementation of Git. If false,\r
        the Cygwin stat() and lstat() functions are used. This may be useful\r
        if your repository consists of a few separate directories joined in\r
        one hierarchy using Cygwin mount. If true, Git uses native Win32 API\r
        whenever it is possible and falls back to Cygwin functions only to\r
        handle symbol links. The native mode is more than twice faster than\r
        normal Cygwin l/stat() functions. True by default, unless core.filemode\r
        is true, in which case ignoreCygwinFSTricks is ignored as Cygwin's\r
        POSIX emulation is required to support core.filemode.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.ignorecase\r
</term>\r
<listitem>\r
<simpara>\r
        If true, this option enables various workarounds to enable\r
        git to work better on filesystems that are not case sensitive,\r
        like FAT. For example, if a directory listing finds\r
        "makefile" when git expects "Makefile", git will assume\r
        it is really the same file, and continue to remember it as\r
        "Makefile".\r
</simpara>\r
<simpara>The default is false, except <xref linkend="git-clone(1)" /> or <xref linkend="git-init(1)" />\r
will probe and set core.ignorecase true if appropriate when the repository\r
is created.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.precomposeunicode\r
</term>\r
<listitem>\r
<simpara>\r
        This option is only used by Mac OS implementation of git.\r
        When core.precomposeunicode=true, git reverts the unicode decomposition\r
        of filenames done by Mac OS. This is useful when sharing a repository\r
        between Mac OS and Linux or Windows.\r
        (Git for Windows 1.7.10 or higher is needed, or git under cygwin 1.7).\r
        When false, file names are handled fully transparent by git,\r
        which is backward compatible with older versions of git.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.trustctime\r
</term>\r
<listitem>\r
<simpara>\r
        If false, the ctime differences between the index and the\r
        working tree are ignored; useful when the inode change time\r
        is regularly modified by something outside Git (file system\r
        crawlers and some backup systems).\r
        See <xref linkend="git-update-index(1)" />. True by default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.quotepath\r
</term>\r
<listitem>\r
<simpara>\r
        The commands that output paths (e.g. <emphasis>ls-files</emphasis>,\r
        <emphasis>diff</emphasis>), when not given the <emphasis>-z</emphasis> option, will quote\r
        "unusual" characters in the pathname by enclosing the\r
        pathname in a double-quote pair and with backslashes the\r
        same way strings in C source code are quoted.  If this\r
        variable is set to false, the bytes higher than 0x80 are\r
        not quoted but output as verbatim.  Note that double\r
        quote, backslash and control characters are always\r
        quoted without <emphasis>-z</emphasis> regardless of the setting of this\r
        variable.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.eol\r
</term>\r
<listitem>\r
<simpara>\r
        Sets the line ending type to use in the working directory for\r
        files that have the <emphasis>text</emphasis> property set.  Alternatives are\r
        <emphasis>lf</emphasis>, <emphasis>crlf</emphasis> and <emphasis>native</emphasis>, which uses the platform's native\r
        line ending.  The default value is <emphasis>native</emphasis>.  See\r
        <xref linkend="gitattributes(5)" /> for more information on end-of-line\r
        conversion.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.safecrlf\r
</term>\r
<listitem>\r
<simpara>\r
        If true, makes git check if converting <emphasis>CRLF</emphasis> is reversible when\r
        end-of-line conversion is active.  Git will verify if a command\r
        modifies a file in the work tree either directly or indirectly.\r
        For example, committing a file followed by checking out the\r
        same file should yield the original file in the work tree.  If\r
        this is not the case for the current setting of\r
        <emphasis>core.autocrlf</emphasis>, git will reject the file.  The variable can\r
        be set to "warn", in which case git will only warn about an\r
        irreversible conversion but continue the operation.\r
</simpara>\r
<simpara>CRLF conversion bears a slight chance of corrupting data.\r
When it is enabled, git will convert CRLF to LF during commit and LF to\r
CRLF during checkout.  A file that contains a mixture of LF and\r
CRLF before the commit cannot be recreated by git.  For text\r
files this is the right thing to do: it corrects line endings\r
such that we have only LF line endings in the repository.\r
But for binary files that are accidentally classified as text the\r
conversion can corrupt data.</simpara>\r
<simpara>If you recognize such corruption early you can easily fix it by\r
setting the conversion type explicitly in .gitattributes.  Right\r
after committing you still have the original file in your work\r
tree and this file is not yet corrupted.  You can explicitly tell\r
git that this file is binary and git will handle the file\r
appropriately.</simpara>\r
<simpara>Unfortunately, the desired effect of cleaning up text files with\r
mixed line endings and the undesired effect of corrupting binary\r
files cannot be distinguished.  In both cases CRLFs are removed\r
in an irreversible way.  For text files this is the right thing\r
to do because CRLFs are line endings, while for binary files\r
converting CRLFs corrupts data.</simpara>\r
<simpara>Note, this safety check does not mean that a checkout will generate a\r
file identical to the original file for a different setting of\r
<emphasis>core.eol</emphasis> and <emphasis>core.autocrlf</emphasis>, but only for the current one.  For\r
example, a text file with <emphasis>LF</emphasis> would be accepted with <emphasis>core.eol=lf</emphasis>\r
and could later be checked out with <emphasis>core.eol=crlf</emphasis>, in which case the\r
resulting file would contain <emphasis>CRLF</emphasis>, although the original file\r
contained <emphasis>LF</emphasis>.  However, in both work trees the line endings would be\r
consistent, that is either all <emphasis>LF</emphasis> or all <emphasis>CRLF</emphasis>, but never mixed.  A\r
file with mixed line endings would be reported by the <emphasis>core.safecrlf</emphasis>\r
mechanism.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.autocrlf\r
</term>\r
<listitem>\r
<simpara>\r
        Setting this variable to "true" is almost the same as setting\r
        the <emphasis>text</emphasis> attribute to "auto" on all files except that text\r
        files are not guaranteed to be normalized: files that contain\r
        <emphasis>CRLF</emphasis> in the repository will not be touched.  Use this\r
        setting if you want to have <emphasis>CRLF</emphasis> line endings in your\r
        working directory even though the repository does not have\r
        normalized line endings.  This variable can be set to <emphasis>input</emphasis>,\r
        in which case no output conversion is performed.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.symlinks\r
</term>\r
<listitem>\r
<simpara>\r
        If false, symbolic links are checked out as small plain files that\r
        contain the link text. <xref linkend="git-update-index(1)" /> and\r
        <xref linkend="git-add(1)" /> will not change the recorded type to regular\r
        file. Useful on filesystems like FAT that do not support\r
        symbolic links.\r
</simpara>\r
<simpara>The default is true, except <xref linkend="git-clone(1)" /> or <xref linkend="git-init(1)" />\r
will probe and set core.symlinks false if appropriate when the repository\r
is created.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.gitProxy\r
</term>\r
<listitem>\r
<simpara>\r
        A "proxy command" to execute (as <emphasis>command host port</emphasis>) instead\r
        of establishing direct connection to the remote server when\r
        using the git protocol for fetching. If the variable value is\r
        in the "COMMAND for DOMAIN" format, the command is applied only\r
        on hostnames ending with the specified domain string. This variable\r
        may be set multiple times and is matched in the given order;\r
        the first match wins.\r
</simpara>\r
<simpara>Can be overridden by the <emphasis>GIT_PROXY_COMMAND</emphasis> environment variable\r
(which always applies universally, without the special "for"\r
handling).</simpara>\r
<simpara>The special string <emphasis>none</emphasis> can be used as the proxy command to\r
specify that no proxy be used for a given domain pattern.\r
This is useful for excluding servers inside a firewall from\r
proxy use, while defaulting to a common proxy for external domains.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.ignoreStat\r
</term>\r
<listitem>\r
<simpara>\r
        If true, commands which modify both the working tree and the index\r
        will mark the updated paths with the "assume unchanged" bit in the\r
        index. These marked files are then assumed to stay unchanged in the\r
        working tree, until you mark them otherwise manually - Git will not\r
        detect the file changes by lstat() calls. This is useful on systems\r
        where those are very slow, such as Microsoft Windows.\r
        See <xref linkend="git-update-index(1)" />.\r
        False by default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.preferSymlinkRefs\r
</term>\r
<listitem>\r
<simpara>\r
        Instead of the default "symref" format for HEAD\r
        and other symbolic reference files, use symbolic links.\r
        This is sometimes needed to work with old scripts that\r
        expect HEAD to be a symbolic link.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.bare\r
</term>\r
<listitem>\r
<simpara>\r
        If true this repository is assumed to be <emphasis>bare</emphasis> and has no\r
        working directory associated with it.  If this is the case a\r
        number of commands that require a working directory will be\r
        disabled, such as <xref linkend="git-add(1)" /> or <xref linkend="git-merge(1)" />.\r
</simpara>\r
<simpara>This setting is automatically guessed by <xref linkend="git-clone(1)" /> or\r
<xref linkend="git-init(1)" /> when the repository was created.  By default a\r
repository that ends in "/.git" is assumed to be not bare (bare =\r
false), while all other repositories are assumed to be bare (bare\r
= true).</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.worktree\r
</term>\r
<listitem>\r
<simpara>\r
        Set the path to the root of the working tree.\r
        This can be overridden by the GIT_WORK_TREE environment\r
        variable and the <emphasis>--work-tree</emphasis> command line option.\r
        The value can be an absolute path or relative to the path to\r
        the .git directory, which is either specified by --git-dir\r
        or GIT_DIR, or automatically discovered.\r
        If --git-dir or GIT_DIR is specified but none of\r
        --work-tree, GIT_WORK_TREE and core.worktree is specified,\r
        the current working directory is regarded as the top level\r
        of your working tree.\r
</simpara>\r
<simpara>Note that this variable is honored even when set in a configuration\r
file in a ".git" subdirectory of a directory and its value differs\r
from the latter directory (e.g. "/path/to/.git/config" has\r
core.worktree set to "/different/path"), which is most likely a\r
misconfiguration.  Running git commands in the "/path/to" directory will\r
still use "/different/path" as the root of the work tree and can cause\r
confusion unless you know what you are doing (e.g. you are creating a\r
read-only snapshot of the same index to a location different from the\r
repository's usual working tree).</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.logAllRefUpdates\r
</term>\r
<listitem>\r
<simpara>\r
        Enable the reflog. Updates to a ref &lt;ref&gt; is logged to the file\r
        "$GIT_DIR/logs/&lt;ref&gt;", by appending the new and old\r
        SHA1, the date/time and the reason of the update, but\r
        only when the file exists.  If this configuration\r
        variable is set to true, missing "$GIT_DIR/logs/&lt;ref&gt;"\r
        file is automatically created for branch heads (i.e. under\r
        refs/heads/), remote refs (i.e. under refs/remotes/),\r
        note refs (i.e. under refs/notes/), and the symbolic ref HEAD.\r
</simpara>\r
<simpara>This information can be used to determine what commit\r
was the tip of a branch "2 days ago".</simpara>\r
<simpara>This value is true by default in a repository that has\r
a working directory associated with it, and false by\r
default in a bare repository.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.repositoryFormatVersion\r
</term>\r
<listitem>\r
<simpara>\r
        Internal variable identifying the repository format and layout\r
        version.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.sharedRepository\r
</term>\r
<listitem>\r
<simpara>\r
        When <emphasis>group</emphasis> (or <emphasis>true</emphasis>), the repository is made shareable between\r
        several users in a group (making sure all the files and objects are\r
        group-writable). When <emphasis>all</emphasis> (or <emphasis>world</emphasis> or <emphasis>everybody</emphasis>), the\r
        repository will be readable by all users, additionally to being\r
        group-shareable. When <emphasis>umask</emphasis> (or <emphasis>false</emphasis>), git will use permissions\r
        reported by umask(2). When <emphasis>0xxx</emphasis>, where <emphasis>0xxx</emphasis> is an octal number,\r
        files in the repository will have this mode value. <emphasis>0xxx</emphasis> will override\r
        user's umask value (whereas the other options will only override\r
        requested parts of the user's umask value). Examples: <emphasis>0660</emphasis> will make\r
        the repo read/write-able for the owner and group, but inaccessible to\r
        others (equivalent to <emphasis>group</emphasis> unless umask is e.g. <emphasis>0022</emphasis>). <emphasis>0640</emphasis> is a\r
        repository that is group-readable but not group-writable.\r
        See <xref linkend="git-init(1)" />. False by default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.warnAmbiguousRefs\r
</term>\r
<listitem>\r
<simpara>\r
        If true, git will warn you if the ref name you passed it is ambiguous\r
        and might match multiple refs in the .git/refs/ tree. True by default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.compression\r
</term>\r
<listitem>\r
<simpara>\r
        An integer -1..9, indicating a default compression level.\r
        -1 is the zlib default. 0 means no compression,\r
        and 1..9 are various speed/size tradeoffs, 9 being slowest.\r
        If set, this provides a default to other compression variables,\r
        such as <emphasis>core.loosecompression</emphasis> and <emphasis>pack.compression</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.loosecompression\r
</term>\r
<listitem>\r
<simpara>\r
        An integer -1..9, indicating the compression level for objects that\r
        are not in a pack file. -1 is the zlib default. 0 means no\r
        compression, and 1..9 are various speed/size tradeoffs, 9 being\r
        slowest.  If not set,  defaults to core.compression.  If that is\r
        not set,  defaults to 1 (best speed).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.packedGitWindowSize\r
</term>\r
<listitem>\r
<simpara>\r
        Number of bytes of a pack file to map into memory in a\r
        single mapping operation.  Larger window sizes may allow\r
        your system to process a smaller number of large pack files\r
        more quickly.  Smaller window sizes will negatively affect\r
        performance due to increased calls to the operating system's\r
        memory manager, but may improve performance when accessing\r
        a large number of large pack files.\r
</simpara>\r
<simpara>Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32\r
MiB on 32 bit platforms and 1 GiB on 64 bit platforms.  This should\r
be reasonable for all users/operating systems.  You probably do\r
not need to adjust this value.</simpara>\r
<simpara>Common unit suffixes of <emphasis>k</emphasis>, <emphasis>m</emphasis>, or <emphasis>g</emphasis> are supported.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.packedGitLimit\r
</term>\r
<listitem>\r
<simpara>\r
        Maximum number of bytes to map simultaneously into memory\r
        from pack files.  If Git needs to access more than this many\r
        bytes at once to complete an operation it will unmap existing\r
        regions to reclaim virtual address space within the process.\r
</simpara>\r
<simpara>Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms.\r
This should be reasonable for all users/operating systems, except on\r
the largest projects.  You probably do not need to adjust this value.</simpara>\r
<simpara>Common unit suffixes of <emphasis>k</emphasis>, <emphasis>m</emphasis>, or <emphasis>g</emphasis> are supported.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.deltaBaseCacheLimit\r
</term>\r
<listitem>\r
<simpara>\r
        Maximum number of bytes to reserve for caching base objects\r
        that may be referenced by multiple deltified objects.  By storing the\r
        entire decompressed base objects in a cache Git is able\r
        to avoid unpacking and decompressing frequently used base\r
        objects multiple times.\r
</simpara>\r
<simpara>Default is 16 MiB on all platforms.  This should be reasonable\r
for all users/operating systems, except on the largest projects.\r
You probably do not need to adjust this value.</simpara>\r
<simpara>Common unit suffixes of <emphasis>k</emphasis>, <emphasis>m</emphasis>, or <emphasis>g</emphasis> are supported.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.bigFileThreshold\r
</term>\r
<listitem>\r
<simpara>\r
        Files larger than this size are stored deflated, without\r
        attempting delta compression.  Storing large files without\r
        delta compression avoids excessive memory usage, at the\r
        slight expense of increased disk usage.\r
</simpara>\r
<simpara>Default is 512 MiB on all platforms.  This should be reasonable\r
for most projects as source code and other text files can still\r
be delta compressed, but larger binary media files won't be.</simpara>\r
<simpara>Common unit suffixes of <emphasis>k</emphasis>, <emphasis>m</emphasis>, or <emphasis>g</emphasis> are supported.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.excludesfile\r
</term>\r
<listitem>\r
<simpara>\r
        In addition to <emphasis>.gitignore</emphasis> (per-directory) and\r
        <emphasis>.git/info/exclude</emphasis>, git looks into this file for patterns\r
        of files which are not meant to be tracked.  "<emphasis>~/</emphasis>" is expanded\r
        to the value of <emphasis>$HOME</emphasis> and "<emphasis>~user/</emphasis>" to the specified user's\r
        home directory. Its default value is $XDG_CONFIG_HOME/git/ignore.\r
        If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore\r
        is used instead. See <xref linkend="gitignore(5)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.askpass\r
</term>\r
<listitem>\r
<simpara>\r
        Some commands (e.g. svn and http interfaces) that interactively\r
        ask for a password can be told to use an external program given\r
        via the value of this variable. Can be overridden by the <emphasis>GIT_ASKPASS</emphasis>\r
        environment variable. If not set, fall back to the value of the\r
        <emphasis>SSH_ASKPASS</emphasis> environment variable or, failing that, a simple password\r
        prompt. The external program shall be given a suitable prompt as\r
        command line argument and write the password on its STDOUT.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.attributesfile\r
</term>\r
<listitem>\r
<simpara>\r
        In addition to <emphasis>.gitattributes</emphasis> (per-directory) and\r
        <emphasis>.git/info/attributes</emphasis>, git looks into this file for attributes\r
        (see <xref linkend="gitattributes(5)" />). Path expansions are made the same\r
        way as for <emphasis>core.excludesfile</emphasis>. Its default value is\r
        $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not\r
        set or empty, $HOME/.config/git/attributes is used instead.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.editor\r
</term>\r
<listitem>\r
<simpara>\r
        Commands such as <emphasis>commit</emphasis> and <emphasis>tag</emphasis> that lets you edit\r
        messages by launching an editor uses the value of this\r
        variable when it is set, and the environment variable\r
        <emphasis>GIT_EDITOR</emphasis> is not set.  See <xref linkend="git-var(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
sequence.editor\r
</term>\r
<listitem>\r
<simpara>\r
        Text editor used by <emphasis>git rebase -i</emphasis> for editing the rebase insn file.\r
        The value is meant to be interpreted by the shell when it is used.\r
        It can be overridden by the <emphasis>GIT_SEQUENCE_EDITOR</emphasis> environment variable.\r
        When not configured the default commit message editor is used instead.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.pager\r
</term>\r
<listitem>\r
<simpara>\r
        The command that git will use to paginate output.  Can\r
        be overridden with the <emphasis>GIT_PAGER</emphasis> environment\r
        variable.  Note that git sets the <emphasis>LESS</emphasis> environment\r
        variable to <emphasis>FRSX</emphasis> if it is unset when it runs the\r
        pager.  One can change these settings by setting the\r
        <emphasis>LESS</emphasis> variable to some other value.  Alternately,\r
        these settings can be overridden on a project or\r
        global basis by setting the <emphasis>core.pager</emphasis> option.\r
        Setting <emphasis>core.pager</emphasis> has no effect on the <emphasis>LESS</emphasis>\r
        environment variable behaviour above, so if you want\r
        to override git's default settings this way, you need\r
        to be explicit.  For example, to disable the S option\r
        in a backward compatible manner, set <emphasis>core.pager</emphasis>\r
        to <emphasis>less -+S</emphasis>.  This will be passed to the shell by\r
        git, which will translate the final command to\r
        <emphasis>LESS=FRSX less -+S</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.whitespace\r
</term>\r
<listitem>\r
<simpara>\r
        A comma separated list of common whitespace problems to\r
        notice.  <emphasis>git diff</emphasis> will use <emphasis>color.diff.whitespace</emphasis> to\r
        highlight them, and <emphasis>git apply --whitespace=error</emphasis> will\r
        consider them as errors.  You can prefix <emphasis>-</emphasis> to disable\r
        any of them (e.g. <emphasis>-trailing-space</emphasis>):\r
</simpara>\r
<itemizedlist>\r
<listitem>\r
<simpara>\r
<emphasis>blank-at-eol</emphasis> treats trailing whitespaces at the end of the line\r
  as an error (enabled by default).\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>space-before-tab</emphasis> treats a space character that appears immediately\r
  before a tab character in the initial indent part of the line as an\r
  error (enabled by default).\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>indent-with-non-tab</emphasis> treats a line that is indented with space\r
  characters instead of the equivalent tabs as an error (not enabled by\r
  default).\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>tab-in-indent</emphasis> treats a tab character in the initial indent part of\r
  the line as an error (not enabled by default).\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>blank-at-eof</emphasis> treats blank lines added at the end of file as an error\r
  (enabled by default).\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>trailing-space</emphasis> is a short-hand to cover both <emphasis>blank-at-eol</emphasis> and\r
  <emphasis>blank-at-eof</emphasis>.\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>cr-at-eol</emphasis> treats a carriage-return at the end of line as\r
  part of the line terminator, i.e. with it, <emphasis>trailing-space</emphasis>\r
  does not trigger if the character before such a carriage-return\r
  is not a whitespace (not enabled by default).\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>tabwidth=&lt;n&gt;</emphasis> tells how many character positions a tab occupies; this\r
  is relevant for <emphasis>indent-with-non-tab</emphasis> and when git fixes <emphasis>tab-in-indent</emphasis>\r
  errors. The default tab width is 8. Allowed values are 1 to 63.\r
</simpara>\r
</listitem>\r
</itemizedlist>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.fsyncobjectfiles\r
</term>\r
<listitem>\r
<simpara>\r
        This boolean will enable <emphasis>fsync()</emphasis> when writing object files.\r
</simpara>\r
<simpara>This is a total waste of time and effort on a filesystem that orders\r
data writes properly, but can be useful for filesystems that do not use\r
journalling (traditional UNIX filesystems) or that only journal metadata\r
and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.preloadindex\r
</term>\r
<listitem>\r
<simpara>\r
        Enable parallel index preload for operations like <emphasis>git diff</emphasis>\r
</simpara>\r
<simpara>This can speed up operations like <emphasis>git diff</emphasis> and <emphasis>git status</emphasis> especially\r
on filesystems like NFS that have weak caching semantics and thus\r
relatively high IO latencies.  With this set to <emphasis>true</emphasis>, git will do the\r
index comparison to the filesystem data in parallel, allowing\r
overlapping IO's.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.createObject\r
</term>\r
<listitem>\r
<simpara>\r
        You can set this to <emphasis>link</emphasis>, in which case a hardlink followed by\r
        a delete of the source are used to make sure that object creation\r
        will not overwrite existing objects.\r
</simpara>\r
<simpara>On some file system/operating system combinations, this is unreliable.\r
Set this config setting to <emphasis>rename</emphasis> there; However, This will remove the\r
check that makes sure that existing object files will not get overwritten.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.notesRef\r
</term>\r
<listitem>\r
<simpara>\r
        When showing commit messages, also show notes which are stored in\r
        the given ref.  The ref must be fully qualified.  If the given\r
        ref does not exist, it is not an error but means that no\r
        notes should be printed.\r
</simpara>\r
<simpara>This setting defaults to "refs/notes/commits", and it can be overridden by\r
the <emphasis>GIT_NOTES_REF</emphasis> environment variable.  See <xref linkend="git-notes(1)" />.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.sparseCheckout\r
</term>\r
<listitem>\r
<simpara>\r
        Enable "sparse checkout" feature. See section "Sparse checkout" in\r
        <xref linkend="git-read-tree(1)" /> for more information.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
core.abbrev\r
</term>\r
<listitem>\r
<simpara>\r
        Set the length object names are abbreviated to.  If unspecified,\r
        many commands abbreviate to 7 hexdigits, which may not be enough\r
        for abbreviated object names to stay unique for sufficiently long\r
        time.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
add.ignore-errors\r
</term>\r
<term>\r
add.ignoreErrors\r
</term>\r
<listitem>\r
<simpara>\r
        Tells <emphasis>git add</emphasis> to continue adding files when some files cannot be\r
        added due to indexing errors. Equivalent to the <emphasis>--ignore-errors</emphasis>\r
        option of <xref linkend="git-add(1)" />.  Older versions of git accept only\r
        <emphasis>add.ignore-errors</emphasis>, which does not follow the usual naming\r
        convention for configuration variables.  Newer versions of git\r
        honor <emphasis>add.ignoreErrors</emphasis> as well.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
alias.*\r
</term>\r
<listitem>\r
<simpara>\r
        Command aliases for the <xref linkend="git(1)" /> command wrapper - e.g.\r
        after defining "alias.last = cat-file commit HEAD", the invocation\r
        "git last" is equivalent to "git cat-file commit HEAD". To avoid\r
        confusion and troubles with script usage, aliases that\r
        hide existing git commands are ignored. Arguments are split by\r
        spaces, the usual shell quoting and escaping is supported.\r
        quote pair and a backslash can be used to quote them.\r
</simpara>\r
<simpara>If the alias expansion is prefixed with an exclamation point,\r
it will be treated as a shell command.  For example, defining\r
"alias.new = !gitk --all --not ORIG_HEAD", the invocation\r
"git new" is equivalent to running the shell command\r
"gitk --all --not ORIG_HEAD".  Note that shell commands will be\r
executed from the top-level directory of a repository, which may\r
not necessarily be the current directory.\r
<emphasis>GIT_PREFIX</emphasis> is set as returned by running <emphasis>git rev-parse --show-prefix</emphasis>\r
from the original current directory. See <xref linkend="git-rev-parse(1)" />.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
am.keepcr\r
</term>\r
<listitem>\r
<simpara>\r
        If true, git-am will call git-mailsplit for patches in mbox format\r
        with parameter <emphasis>--keep-cr</emphasis>. In this case git-mailsplit will\r
        not remove <emphasis>\r</emphasis> from lines ending with <emphasis>\r\n</emphasis>. Can be overridden\r
        by giving <emphasis>--no-keep-cr</emphasis> from the command line.\r
        See <xref linkend="git-am(1)" />, <xref linkend="git-mailsplit(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
apply.ignorewhitespace\r
</term>\r
<listitem>\r
<simpara>\r
        When set to <emphasis>change</emphasis>, tells <emphasis>git apply</emphasis> to ignore changes in\r
        whitespace, in the same way as the <emphasis>--ignore-space-change</emphasis>\r
        option.\r
        When set to one of: no, none, never, false tells <emphasis>git apply</emphasis> to\r
        respect all whitespace differences.\r
        See <xref linkend="git-apply(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
apply.whitespace\r
</term>\r
<listitem>\r
<simpara>\r
        Tells <emphasis>git apply</emphasis> how to handle whitespaces, in the same way\r
        as the <emphasis>--whitespace</emphasis> option. See <xref linkend="git-apply(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
branch.autosetupmerge\r
</term>\r
<listitem>\r
<simpara>\r
        Tells <emphasis>git branch</emphasis> and <emphasis>git checkout</emphasis> to set up new branches\r
        so that <xref linkend="git-pull(1)" /> will appropriately merge from the\r
        starting point branch. Note that even if this option is not set,\r
        this behavior can be chosen per-branch using the <emphasis>--track</emphasis>\r
        and <emphasis>--no-track</emphasis> options. The valid settings are: <emphasis>false</emphasis> -- no\r
        automatic setup is done; <emphasis>true</emphasis> -- automatic setup is done when the\r
        starting point is a remote-tracking branch; <emphasis>always</emphasis> --\r
        automatic setup is done when the starting point is either a\r
        local branch or remote-tracking\r
        branch. This option defaults to true.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
branch.autosetuprebase\r
</term>\r
<listitem>\r
<simpara>\r
        When a new branch is created with <emphasis>git branch</emphasis> or <emphasis>git checkout</emphasis>\r
        that tracks another branch, this variable tells git to set\r
        up pull to rebase instead of merge (see "branch.&lt;name&gt;.rebase").\r
        When <emphasis>never</emphasis>, rebase is never automatically set to true.\r
        When <emphasis>local</emphasis>, rebase is set to true for tracked branches of\r
        other local branches.\r
        When <emphasis>remote</emphasis>, rebase is set to true for tracked branches of\r
        remote-tracking branches.\r
        When <emphasis>always</emphasis>, rebase will be set to true for all tracking\r
        branches.\r
        See "branch.autosetupmerge" for details on how to set up a\r
        branch to track another branch.\r
        This option defaults to never.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
branch.&lt;name&gt;.remote\r
</term>\r
<listitem>\r
<simpara>\r
        When in branch &lt;name&gt;, it tells <emphasis>git fetch</emphasis> and <emphasis>git push</emphasis> which\r
        remote to fetch from/push to.  It defaults to <emphasis>origin</emphasis> if no remote is\r
        configured. <emphasis>origin</emphasis> is also used if you are not on any branch.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
branch.&lt;name&gt;.merge\r
</term>\r
<listitem>\r
<simpara>\r
        Defines, together with branch.&lt;name&gt;.remote, the upstream branch\r
        for the given branch. It tells <emphasis>git fetch</emphasis>/<emphasis>git pull</emphasis>/<emphasis>git rebase</emphasis> which\r
        branch to merge and can also affect <emphasis>git push</emphasis> (see push.default).\r
        When in branch &lt;name&gt;, it tells <emphasis>git fetch</emphasis> the default\r
        refspec to be marked for merging in FETCH_HEAD. The value is\r
        handled like the remote part of a refspec, and must match a\r
        ref which is fetched from the remote given by\r
        "branch.&lt;name&gt;.remote".\r
        The merge information is used by <emphasis>git pull</emphasis> (which at first calls\r
        <emphasis>git fetch</emphasis>) to lookup the default branch for merging. Without\r
        this option, <emphasis>git pull</emphasis> defaults to merge the first refspec fetched.\r
        Specify multiple values to get an octopus merge.\r
        If you wish to setup <emphasis>git pull</emphasis> so that it merges into &lt;name&gt; from\r
        another branch in the local repository, you can point\r
        branch.&lt;name&gt;.merge to the desired branch, and use the special setting\r
        <emphasis>.</emphasis> (a period) for branch.&lt;name&gt;.remote.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
branch.&lt;name&gt;.mergeoptions\r
</term>\r
<listitem>\r
<simpara>\r
        Sets default options for merging into branch &lt;name&gt;. The syntax and\r
        supported options are the same as those of <xref linkend="git-merge(1)" />, but\r
        option values containing whitespace characters are currently not\r
        supported.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
branch.&lt;name&gt;.rebase\r
</term>\r
<listitem>\r
<simpara>\r
        When true, rebase the branch &lt;name&gt; on top of the fetched branch,\r
        instead of merging the default branch from the default remote when\r
        "git pull" is run. See "pull.rebase" for doing this in a non\r
        branch-specific manner.\r
</simpara>\r
<simpara><emphasis role="strong">NOTE</emphasis>: this is a possibly dangerous operation; do <emphasis role="strong">not</emphasis> use\r
it unless you understand the implications (see <xref linkend="git-rebase(1)" />\r
for details).</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
browser.&lt;tool&gt;.cmd\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the command to invoke the specified browser. The\r
        specified command is evaluated in shell with the URLs passed\r
        as arguments. (See <xref linkend="git-web&#45;&#45;browse(1)" />.)\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
browser.&lt;tool&gt;.path\r
</term>\r
<listitem>\r
<simpara>\r
        Override the path for the given tool that may be used to\r
        browse HTML help (see <emphasis>-w</emphasis> option in <xref linkend="git-help(1)" />) or a\r
        working repository in gitweb (see <xref linkend="git-instaweb(1)" />).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
clean.requireForce\r
</term>\r
<listitem>\r
<simpara>\r
        A boolean to make git-clean do nothing unless given -f\r
        or -n.   Defaults to true.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.branch\r
</term>\r
<listitem>\r
<simpara>\r
        A boolean to enable/disable color in the output of\r
        <xref linkend="git-branch(1)" />. May be set to <emphasis>always</emphasis>,\r
        <emphasis>false</emphasis> (or <emphasis>never</emphasis>) or <emphasis>auto</emphasis> (or <emphasis>true</emphasis>), in which case colors are used\r
        only when the output is to a terminal. Defaults to false.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.branch.&lt;slot&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        Use customized color for branch coloration. <emphasis>&lt;slot&gt;</emphasis> is one of\r
        <emphasis>current</emphasis> (the current branch), <emphasis>local</emphasis> (a local branch),\r
        <emphasis>remote</emphasis> (a remote-tracking branch in refs/remotes/), <emphasis>plain</emphasis> (other\r
        refs).\r
</simpara>\r
<simpara>The value for these configuration variables is a list of colors (at most\r
two) and attributes (at most one), separated by spaces.  The colors\r
accepted are <emphasis>normal</emphasis>, <emphasis>black</emphasis>, <emphasis>red</emphasis>, <emphasis>green</emphasis>, <emphasis>yellow</emphasis>, <emphasis>blue</emphasis>,\r
<emphasis>magenta</emphasis>, <emphasis>cyan</emphasis> and <emphasis>white</emphasis>; the attributes are <emphasis>bold</emphasis>, <emphasis>dim</emphasis>, <emphasis>ul</emphasis>,\r
<emphasis>blink</emphasis> and <emphasis>reverse</emphasis>.  The first color given is the foreground; the\r
second is the background.  The position of the attribute, if any,\r
doesn't matter.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.diff\r
</term>\r
<listitem>\r
<simpara>\r
        Whether to use ANSI escape sequences to add color to patches.\r
        If this is set to <emphasis>always</emphasis>, <xref linkend="git-diff(1)" />,\r
        <xref linkend="git-log(1)" />, and <xref linkend="git-show(1)" /> will use color\r
        for all patches.  If it is set to <emphasis>true</emphasis> or <emphasis>auto</emphasis>, those\r
        commands will only use color when output is to the terminal.\r
        Defaults to false.\r
</simpara>\r
<simpara>This does not affect <xref linkend="git-format-patch(1)" /> nor the\r
<emphasis>git-diff-&#42;</emphasis> plumbing commands.  Can be overridden on the\r
command line with the <emphasis>--color[=&lt;when&gt;]</emphasis> option.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.diff.&lt;slot&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        Use customized color for diff colorization.  <emphasis>&lt;slot&gt;</emphasis> specifies\r
        which part of the patch to use the specified color, and is one\r
        of <emphasis>plain</emphasis> (context text), <emphasis>meta</emphasis> (metainformation), <emphasis>frag</emphasis>\r
        (hunk header), <emphasis>func</emphasis> (function in hunk header), <emphasis>old</emphasis> (removed lines),\r
        <emphasis>new</emphasis> (added lines), <emphasis>commit</emphasis> (commit headers), or <emphasis>whitespace</emphasis>\r
        (highlighting whitespace errors). The values of these variables may be\r
        specified as in color.branch.&lt;slot&gt;.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.decorate.&lt;slot&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        Use customized color for <emphasis>git log --decorate</emphasis> output.  <emphasis>&lt;slot&gt;</emphasis> is one\r
        of <emphasis>branch</emphasis>, <emphasis>remoteBranch</emphasis>, <emphasis>tag</emphasis>, <emphasis>stash</emphasis> or <emphasis>HEAD</emphasis> for local\r
        branches, remote-tracking branches, tags, stash and HEAD, respectively.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.grep\r
</term>\r
<listitem>\r
<simpara>\r
        When set to <emphasis>always</emphasis>, always highlight matches.  When <emphasis>false</emphasis> (or\r
        <emphasis>never</emphasis>), never.  When set to <emphasis>true</emphasis> or <emphasis>auto</emphasis>, use color only\r
        when the output is written to the terminal.  Defaults to <emphasis>false</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.grep.&lt;slot&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        Use customized color for grep colorization.  <emphasis>&lt;slot&gt;</emphasis> specifies which\r
        part of the line to use the specified color, and is one of\r
</simpara>\r
<variablelist>\r
<varlistentry>\r
<term>\r
<emphasis>context</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        non-matching text in context lines (when using <emphasis>-A</emphasis>, <emphasis>-B</emphasis>, or <emphasis>-C</emphasis>)\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>filename</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        filename prefix (when not using <emphasis>-h</emphasis>)\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>function</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        function name lines (when using <emphasis>-p</emphasis>)\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>linenumber</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        line number prefix (when using <emphasis>-n</emphasis>)\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>match</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        matching text\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>selected</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        non-matching text in selected lines\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>separator</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        separators between fields on a line (<emphasis>:</emphasis>, <emphasis>-</emphasis>, and <emphasis>=</emphasis>)\r
        and between hunks (<emphasis>--</emphasis>)\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
<simpara>The values of these variables may be specified as in color.branch.&lt;slot&gt;.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.interactive\r
</term>\r
<listitem>\r
<simpara>\r
        When set to <emphasis>always</emphasis>, always use colors for interactive prompts\r
        and displays (such as those used by "git-add --interactive").\r
        When false (or <emphasis>never</emphasis>), never.  When set to <emphasis>true</emphasis> or <emphasis>auto</emphasis>, use\r
        colors only when the output is to the terminal. Defaults to false.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.interactive.&lt;slot&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        Use customized color for <emphasis>git add --interactive</emphasis>\r
        output. <emphasis>&lt;slot&gt;</emphasis> may be <emphasis>prompt</emphasis>, <emphasis>header</emphasis>, <emphasis>help</emphasis> or <emphasis>error</emphasis>, for\r
        four distinct types of normal output from interactive\r
        commands.  The values of these variables may be specified as\r
        in color.branch.&lt;slot&gt;.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.pager\r
</term>\r
<listitem>\r
<simpara>\r
        A boolean to enable/disable colored output when the pager is in\r
        use (default is true).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.showbranch\r
</term>\r
<listitem>\r
<simpara>\r
        A boolean to enable/disable color in the output of\r
        <xref linkend="git-show-branch(1)" />. May be set to <emphasis>always</emphasis>,\r
        <emphasis>false</emphasis> (or <emphasis>never</emphasis>) or <emphasis>auto</emphasis> (or <emphasis>true</emphasis>), in which case colors are used\r
        only when the output is to a terminal. Defaults to false.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.status\r
</term>\r
<listitem>\r
<simpara>\r
        A boolean to enable/disable color in the output of\r
        <xref linkend="git-status(1)" />. May be set to <emphasis>always</emphasis>,\r
        <emphasis>false</emphasis> (or <emphasis>never</emphasis>) or <emphasis>auto</emphasis> (or <emphasis>true</emphasis>), in which case colors are used\r
        only when the output is to a terminal. Defaults to false.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.status.&lt;slot&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        Use customized color for status colorization. <emphasis>&lt;slot&gt;</emphasis> is\r
        one of <emphasis>header</emphasis> (the header text of the status message),\r
        <emphasis>added</emphasis> or <emphasis>updated</emphasis> (files which are added but not committed),\r
        <emphasis>changed</emphasis> (files which are changed but not added in the index),\r
        <emphasis>untracked</emphasis> (files which are not tracked by git),\r
        <emphasis>branch</emphasis> (the current branch), or\r
        <emphasis>nobranch</emphasis> (the color the <emphasis>no branch</emphasis> warning is shown in, defaulting\r
        to red). The values of these variables may be specified as in\r
        color.branch.&lt;slot&gt;.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
color.ui\r
</term>\r
<listitem>\r
<simpara>\r
        This variable determines the default value for variables such\r
        as <emphasis>color.diff</emphasis> and <emphasis>color.grep</emphasis> that control the use of color\r
        per command family. Its scope will expand as more commands learn\r
        configuration to set a default for the <emphasis>--color</emphasis> option.  Set it\r
        to <emphasis>always</emphasis> if you want all output not intended for machine\r
        consumption to use color, to <emphasis>true</emphasis> or <emphasis>auto</emphasis> if you want such\r
        output to use color when written to the terminal, or to <emphasis>false</emphasis> or\r
        <emphasis>never</emphasis> if you prefer git commands not to use color unless enabled\r
        explicitly with some other configuration or the <emphasis>--color</emphasis> option.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
column.ui\r
</term>\r
<listitem>\r
<simpara>\r
        Specify whether supported commands should output in columns.\r
        This variable consists of a list of tokens separated by spaces\r
        or commas:\r
</simpara>\r
<variablelist>\r
<varlistentry>\r
<term>\r
<emphasis>always</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        always show in columns\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>never</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        never show in columns\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>auto</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        show in columns if the output is to the terminal\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>column</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        fill columns before rows (default)\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>row</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        fill rows before columns\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>plain</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        show in one column\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>dense</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        make unequal size columns to utilize more space\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>nodense</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        make equal size columns\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
<simpara>This option defaults to <emphasis>never</emphasis>.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
column.branch\r
</term>\r
<listitem>\r
<simpara>\r
        Specify whether to output branch listing in <emphasis>git branch</emphasis> in columns.\r
        See <emphasis>column.ui</emphasis> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
column.status\r
</term>\r
<listitem>\r
<simpara>\r
        Specify whether to output untracked files in <emphasis>git status</emphasis> in columns.\r
        See <emphasis>column.ui</emphasis> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
column.tag\r
</term>\r
<listitem>\r
<simpara>\r
        Specify whether to output tag listing in <emphasis>git tag</emphasis> in columns.\r
        See <emphasis>column.ui</emphasis> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
commit.status\r
</term>\r
<listitem>\r
<simpara>\r
        A boolean to enable/disable inclusion of status information in the\r
        commit message template when using an editor to prepare the commit\r
        message.  Defaults to true.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
commit.template\r
</term>\r
<listitem>\r
<simpara>\r
        Specify a file to use as the template for new commit messages.\r
        "<emphasis>~/</emphasis>" is expanded to the value of <emphasis>$HOME</emphasis> and "<emphasis>~user/</emphasis>" to the\r
        specified user's home directory.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
credential.helper\r
</term>\r
<listitem>\r
<simpara>\r
        Specify an external helper to be called when a username or\r
        password credential is needed; the helper may consult external\r
        storage to avoid prompting the user for the credentials. See\r
        <xref linkend="gitcredentials(7)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
credential.useHttpPath\r
</term>\r
<listitem>\r
<simpara>\r
        When acquiring credentials, consider the "path" component of an http\r
        or https URL to be important. Defaults to false. See\r
        <xref linkend="gitcredentials(7)" /> for more information.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
credential.username\r
</term>\r
<listitem>\r
<simpara>\r
        If no username is set for a network authentication, use this username\r
        by default. See credential.&lt;context&gt;.* below, and\r
        <xref linkend="gitcredentials(7)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
credential.&lt;url&gt;.*\r
</term>\r
<listitem>\r
<simpara>\r
        Any of the credential.* options above can be applied selectively to\r
        some credentials. For example "credential.https://example.com.username"\r
        would set the default username only for https connections to\r
        example.com. See <xref linkend="gitcredentials(7)" /> for details on how URLs are\r
        matched.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.autorefreshindex\r
</term>\r
<listitem>\r
<simpara>\r
        When using <emphasis>git diff</emphasis> to compare with work tree\r
        files, do not consider stat-only change as changed.\r
        Instead, silently run <emphasis>git update-index --refresh</emphasis> to\r
        update the cached stat information for paths whose\r
        contents in the work tree match the contents in the\r
        index.  This option defaults to true.  Note that this\r
        affects only <emphasis>git diff</emphasis> Porcelain, and not lower level\r
        <emphasis>diff</emphasis> commands such as <emphasis>git diff-files</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.dirstat\r
</term>\r
<listitem>\r
<simpara>\r
        A comma separated list of <emphasis>--dirstat</emphasis> parameters specifying the\r
        default behavior of the <emphasis>--dirstat</emphasis> option to <xref linkend="git-diff(1)" />`\r
        and friends. The defaults can be overridden on the command line\r
        (using <emphasis>--dirstat=&lt;param1,param2,...&gt;</emphasis>). The fallback defaults\r
        (when not changed by <emphasis>diff.dirstat</emphasis>) are <emphasis>changes,noncumulative,3</emphasis>.\r
        The following parameters are available:\r
</simpara>\r
<variablelist>\r
<varlistentry>\r
<term>\r
<emphasis>changes</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        Compute the dirstat numbers by counting the lines that have been\r
        removed from the source, or added to the destination. This ignores\r
        the amount of pure code movements within a file.  In other words,\r
        rearranging lines in a file is not counted as much as other changes.\r
        This is the default behavior when no parameter is given.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>lines</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        Compute the dirstat numbers by doing the regular line-based diff\r
        analysis, and summing the removed/added line counts. (For binary\r
        files, count 64-byte chunks instead, since binary files have no\r
        natural concept of lines). This is a more expensive <emphasis>--dirstat</emphasis>\r
        behavior than the <emphasis>changes</emphasis> behavior, but it does count rearranged\r
        lines within a file as much as other changes. The resulting output\r
        is consistent with what you get from the other <emphasis>--*stat</emphasis> options.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>files</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        Compute the dirstat numbers by counting the number of files changed.\r
        Each changed file counts equally in the dirstat analysis. This is\r
        the computationally cheapest <emphasis>--dirstat</emphasis> behavior, since it does\r
        not have to look at the file contents at all.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>cumulative</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        Count changes in a child directory for the parent directory as well.\r
        Note that when using <emphasis>cumulative</emphasis>, the sum of the percentages\r
        reported may exceed 100%. The default (non-cumulative) behavior can\r
        be specified with the <emphasis>noncumulative</emphasis> parameter.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
&lt;limit&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        An integer parameter specifies a cut-off percent (3% by default).\r
        Directories contributing less than this percentage of the changes\r
        are not shown in the output.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
<simpara>Example: The following will count changed files, while ignoring\r
directories with less than 10% of the total amount of changed files,\r
and accumulating child directory counts in the parent directories:\r
<emphasis>files,10,cumulative</emphasis>.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.statGraphWidth\r
</term>\r
<listitem>\r
<simpara>\r
        Limit the width of the graph part in --stat output. If set, applies\r
        to all commands generating --stat output except format-patch.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.context\r
</term>\r
<listitem>\r
<simpara>\r
        Generate diffs with &lt;n&gt; lines of context instead of the default\r
        of 3. This value is overridden by the -U option.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.external\r
</term>\r
<listitem>\r
<simpara>\r
        If this config variable is set, diff generation is not\r
        performed using the internal diff machinery, but using the\r
        given command.  Can be overridden with the GIT_EXTERNAL_DIFF\r
        environment variable.  The command is called with parameters\r
        as described under "git Diffs" in <xref linkend="git(1)" />.  Note: if\r
        you want to use an external diff program only on a subset of\r
        your files, you might want to use <xref linkend="gitattributes(5)" /> instead.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.ignoreSubmodules\r
</term>\r
<listitem>\r
<simpara>\r
        Sets the default value of --ignore-submodules. Note that this\r
        affects only <emphasis>git diff</emphasis> Porcelain, and not lower level <emphasis>diff</emphasis>\r
        commands such as <emphasis>git diff-files</emphasis>. <emphasis>git checkout</emphasis> also honors\r
        this setting when reporting uncommitted changes.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.mnemonicprefix\r
</term>\r
<listitem>\r
<simpara>\r
        If set, <emphasis>git diff</emphasis> uses a prefix pair that is different from the\r
        standard "a/" and "b/" depending on what is being compared.  When\r
        this configuration is in effect, reverse diff output also swaps\r
        the order of the prefixes:\r
</simpara>\r
<variablelist>\r
<varlistentry>\r
<term>\r
<emphasis>git diff</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        compares the (i)ndex and the (w)ork tree;\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>git diff HEAD</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
         compares a (c)ommit and the (w)ork tree;\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>git diff --cached</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        compares a (c)ommit and the (i)ndex;\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>git diff HEAD:file1 file2</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        compares an (o)bject and a (w)ork tree entity;\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
<emphasis>git diff --no-index a b</emphasis>\r
</term>\r
<listitem>\r
<simpara>\r
        compares two non-git things (1) and (2).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.noprefix\r
</term>\r
<listitem>\r
<simpara>\r
        If set, <emphasis>git diff</emphasis> does not show any source or destination prefix.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.renameLimit\r
</term>\r
<listitem>\r
<simpara>\r
        The number of files to consider when performing the copy/rename\r
        detection; equivalent to the <emphasis>git diff</emphasis> option <emphasis>-l</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.renames\r
</term>\r
<listitem>\r
<simpara>\r
        Tells git to detect renames.  If set to any boolean value, it\r
        will enable basic rename detection.  If set to "copies" or\r
        "copy", it will detect copies, as well.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.suppressBlankEmpty\r
</term>\r
<listitem>\r
<simpara>\r
        A boolean to inhibit the standard behavior of printing a space\r
        before each empty output line. Defaults to false.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.submodule\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the format in which differences in submodules are\r
        shown.  The "log" format lists the commits in the range like\r
        <xref linkend="git-submodule(1)" /> <emphasis>summary</emphasis> does.  The "short" format\r
        format just shows the names of the commits at the beginning\r
        and end of the range.  Defaults to short.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.wordRegex\r
</term>\r
<listitem>\r
<simpara>\r
        A POSIX Extended Regular Expression used to determine what is a "word"\r
        when performing word-by-word difference calculations.  Character\r
        sequences that match the regular expression are "words", all other\r
        characters are <emphasis role="strong">ignorable</emphasis> whitespace.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.&lt;driver&gt;.command\r
</term>\r
<listitem>\r
<simpara>\r
        The custom diff driver command.  See <xref linkend="gitattributes(5)" />\r
        for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.&lt;driver&gt;.xfuncname\r
</term>\r
<listitem>\r
<simpara>\r
        The regular expression that the diff driver should use to\r
        recognize the hunk header.  A built-in pattern may also be used.\r
        See <xref linkend="gitattributes(5)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.&lt;driver&gt;.binary\r
</term>\r
<listitem>\r
<simpara>\r
        Set this option to true to make the diff driver treat files as\r
        binary.  See <xref linkend="gitattributes(5)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.&lt;driver&gt;.textconv\r
</term>\r
<listitem>\r
<simpara>\r
        The command that the diff driver should call to generate the\r
        text-converted version of a file.  The result of the\r
        conversion is used to generate a human-readable diff.  See\r
        <xref linkend="gitattributes(5)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.&lt;driver&gt;.wordregex\r
</term>\r
<listitem>\r
<simpara>\r
        The regular expression that the diff driver should use to\r
        split words in a line.  See <xref linkend="gitattributes(5)" /> for\r
        details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.&lt;driver&gt;.cachetextconv\r
</term>\r
<listitem>\r
<simpara>\r
        Set this option to true to make the diff driver cache the text\r
        conversion outputs.  See <xref linkend="gitattributes(5)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
diff.tool\r
</term>\r
<listitem>\r
<simpara>\r
        The diff tool to be used by <xref linkend="git-difftool(1)" />.  This\r
        option overrides <emphasis>merge.tool</emphasis>, and has the same valid built-in\r
        values as <emphasis>merge.tool</emphasis> minus "tortoisemerge" and plus\r
        "kompare".  Any other value is treated as a custom diff tool,\r
        and there must be a corresponding <emphasis>difftool.&lt;tool&gt;.cmd</emphasis>\r
        option.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
difftool.&lt;tool&gt;.path\r
</term>\r
<listitem>\r
<simpara>\r
        Override the path for the given tool.  This is useful in case\r
        your tool is not in the PATH.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
difftool.&lt;tool&gt;.cmd\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the command to invoke the specified diff tool.\r
        The specified command is evaluated in shell with the following\r
        variables available:  <emphasis>LOCAL</emphasis> is set to the name of the temporary\r
        file containing the contents of the diff pre-image and <emphasis>REMOTE</emphasis>\r
        is set to the name of the temporary file containing the contents\r
        of the diff post-image.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
difftool.prompt\r
</term>\r
<listitem>\r
<simpara>\r
        Prompt before each invocation of the diff tool.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
fetch.recurseSubmodules\r
</term>\r
<listitem>\r
<simpara>\r
        This option can be either set to a boolean value or to <emphasis>on-demand</emphasis>.\r
        Setting it to a boolean changes the behavior of fetch and pull to\r
        unconditionally recurse into submodules when set to true or to not\r
        recurse at all when set to false. When set to <emphasis>on-demand</emphasis> (the default\r
        value), fetch and pull will only recurse into a populated submodule\r
        when its superproject retrieves a commit that updates the submodule's\r
        reference.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
fetch.fsckObjects\r
</term>\r
<listitem>\r
<simpara>\r
        If it is set to true, git-fetch-pack will check all fetched\r
        objects. It will abort in the case of a malformed object or a\r
        broken link. The result of an abort are only dangling objects.\r
        Defaults to false. If not set, the value of <emphasis>transfer.fsckObjects</emphasis>\r
        is used instead.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
fetch.unpackLimit\r
</term>\r
<listitem>\r
<simpara>\r
        If the number of objects fetched over the git native\r
        transfer is below this\r
        limit, then the objects will be unpacked into loose object\r
        files. However if the number of received objects equals or\r
        exceeds this limit then the received pack will be stored as\r
        a pack, after adding any missing delta bases.  Storing the\r
        pack from a push can make the push operation complete faster,\r
        especially on slow filesystems.  If not set, the value of\r
        <emphasis>transfer.unpackLimit</emphasis> is used instead.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.attach\r
</term>\r
<listitem>\r
<simpara>\r
        Enable multipart/mixed attachments as the default for\r
        <emphasis>format-patch</emphasis>.  The value can also be a double quoted string\r
        which will enable attachments as the default and set the\r
        value as the boundary.  See the --attach option in\r
        <xref linkend="git-format-patch(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.numbered\r
</term>\r
<listitem>\r
<simpara>\r
        A boolean which can enable or disable sequence numbers in patch\r
        subjects.  It defaults to "auto" which enables it only if there\r
        is more than one patch.  It can be enabled or disabled for all\r
        messages by setting it to "true" or "false".  See --numbered\r
        option in <xref linkend="git-format-patch(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.headers\r
</term>\r
<listitem>\r
<simpara>\r
        Additional email headers to include in a patch to be submitted\r
        by mail.  See <xref linkend="git-format-patch(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.to\r
</term>\r
<term>\r
format.cc\r
</term>\r
<listitem>\r
<simpara>\r
        Additional recipients to include in a patch to be submitted\r
        by mail.  See the --to and --cc options in\r
        <xref linkend="git-format-patch(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.subjectprefix\r
</term>\r
<listitem>\r
<simpara>\r
        The default for format-patch is to output files with the <emphasis>[PATCH]</emphasis>\r
        subject prefix. Use this variable to change that prefix.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.signature\r
</term>\r
<listitem>\r
<simpara>\r
        The default for format-patch is to output a signature containing\r
        the git version number. Use this variable to change that default.\r
        Set this variable to the empty string ("") to suppress\r
        signature generation.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.suffix\r
</term>\r
<listitem>\r
<simpara>\r
        The default for format-patch is to output files with the suffix\r
        <emphasis>.patch</emphasis>. Use this variable to change that suffix (make sure to\r
        include the dot if you want it).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.pretty\r
</term>\r
<listitem>\r
<simpara>\r
        The default pretty format for log/show/whatchanged command,\r
        See <xref linkend="git-log(1)" />, <xref linkend="git-show(1)" />,\r
        <xref linkend="git-whatchanged(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.thread\r
</term>\r
<listitem>\r
<simpara>\r
        The default threading style for <emphasis>git format-patch</emphasis>.  Can be\r
        a boolean value, or <emphasis>shallow</emphasis> or <emphasis>deep</emphasis>.  <emphasis>shallow</emphasis> threading\r
        makes every mail a reply to the head of the series,\r
        where the head is chosen from the cover letter, the\r
        <emphasis>--in-reply-to</emphasis>, and the first patch mail, in this order.\r
        <emphasis>deep</emphasis> threading makes every mail a reply to the previous one.\r
        A true boolean value is the same as <emphasis>shallow</emphasis>, and a false\r
        value disables threading.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
format.signoff\r
</term>\r
<listitem>\r
<simpara>\r
    A boolean value which lets you enable the <emphasis>-s/--signoff</emphasis> option of\r
    format-patch by default. <emphasis role="strong">Note:</emphasis> Adding the Signed-off-by: line to a\r
    patch should be a conscious act and means that you certify you have\r
    the rights to submit this work under the same open source license.\r
    Please see the <emphasis>SubmittingPatches</emphasis> document for further discussion.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
filter.&lt;driver&gt;.clean\r
</term>\r
<listitem>\r
<simpara>\r
        The command which is used to convert the content of a worktree\r
        file to a blob upon checkin.  See <xref linkend="gitattributes(5)" /> for\r
        details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
filter.&lt;driver&gt;.smudge\r
</term>\r
<listitem>\r
<simpara>\r
        The command which is used to convert the content of a blob\r
        object to a worktree file upon checkout.  See\r
        <xref linkend="gitattributes(5)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gc.aggressiveWindow\r
</term>\r
<listitem>\r
<simpara>\r
        The window size parameter used in the delta compression\r
        algorithm used by <emphasis>git gc --aggressive</emphasis>.  This defaults\r
        to 250.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gc.auto\r
</term>\r
<listitem>\r
<simpara>\r
        When there are approximately more than this many loose\r
        objects in the repository, <emphasis>git gc --auto</emphasis> will pack them.\r
        Some Porcelain commands use this command to perform a\r
        light-weight garbage collection from time to time.  The\r
        default value is 6700.  Setting this to 0 disables it.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gc.autopacklimit\r
</term>\r
<listitem>\r
<simpara>\r
        When there are more than this many packs that are not\r
        marked with <emphasis>*.keep</emphasis> file in the repository, <emphasis>git gc\r
        --auto</emphasis> consolidates them into one larger pack.  The\r
        default value is 50.  Setting this to 0 disables it.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gc.packrefs\r
</term>\r
<listitem>\r
<simpara>\r
        Running <emphasis>git pack-refs</emphasis> in a repository renders it\r
        unclonable by Git versions prior to 1.5.1.2 over dumb\r
        transports such as HTTP.  This variable determines whether\r
        <emphasis>git gc</emphasis> runs <emphasis>git pack-refs</emphasis>. This can be set to <emphasis>notbare</emphasis>\r
        to enable it within all non-bare repos or it can be set to a\r
        boolean value.  The default is <emphasis>true</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gc.pruneexpire\r
</term>\r
<listitem>\r
<simpara>\r
        When <emphasis>git gc</emphasis> is run, it will call <emphasis>prune --expire 2.weeks.ago</emphasis>.\r
        Override the grace period with this config variable.  The value\r
        "now" may be used to disable this  grace period and always prune\r
        unreachable objects immediately.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gc.reflogexpire\r
</term>\r
<term>\r
gc.&lt;pattern&gt;.reflogexpire\r
</term>\r
<listitem>\r
<simpara>\r
        <emphasis>git reflog expire</emphasis> removes reflog entries older than\r
        this time; defaults to 90 days.  With "&lt;pattern&gt;" (e.g.\r
        "refs/stash") in the middle the setting applies only to\r
        the refs that match the &lt;pattern&gt;.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gc.reflogexpireunreachable\r
</term>\r
<term>\r
gc.&lt;ref&gt;.reflogexpireunreachable\r
</term>\r
<listitem>\r
<simpara>\r
        <emphasis>git reflog expire</emphasis> removes reflog entries older than\r
        this time and are not reachable from the current tip;\r
        defaults to 30 days.  With "&lt;pattern&gt;" (e.g. "refs/stash")\r
        in the middle, the setting applies only to the refs that\r
        match the &lt;pattern&gt;.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gc.rerereresolved\r
</term>\r
<listitem>\r
<simpara>\r
        Records of conflicted merge you resolved earlier are\r
        kept for this many days when <emphasis>git rerere gc</emphasis> is run.\r
        The default is 60 days.  See <xref linkend="git-rerere(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gc.rerereunresolved\r
</term>\r
<listitem>\r
<simpara>\r
        Records of conflicted merge you have not resolved are\r
        kept for this many days when <emphasis>git rerere gc</emphasis> is run.\r
        The default is 15 days.  See <xref linkend="git-rerere(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitcvs.commitmsgannotation\r
</term>\r
<listitem>\r
<simpara>\r
        Append this string to each commit message. Set to empty string\r
        to disable this feature. Defaults to "via git-CVS emulator".\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitcvs.enabled\r
</term>\r
<listitem>\r
<simpara>\r
        Whether the CVS server interface is enabled for this repository.\r
        See <xref linkend="git-cvsserver(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitcvs.logfile\r
</term>\r
<listitem>\r
<simpara>\r
        Path to a log file where the CVS server interface well&#8230; logs\r
        various stuff. See <xref linkend="git-cvsserver(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitcvs.usecrlfattr\r
</term>\r
<listitem>\r
<simpara>\r
        If true, the server will look up the end-of-line conversion\r
        attributes for files to determine the <emphasis>-k</emphasis> modes to use. If\r
        the attributes force git to treat a file as text,\r
        the <emphasis>-k</emphasis> mode will be left blank so CVS clients will\r
        treat it as text. If they suppress text conversion, the file\r
        will be set with <emphasis>-kb</emphasis> mode, which suppresses any newline munging\r
        the client might otherwise do. If the attributes do not allow\r
        the file type to be determined, then <emphasis>gitcvs.allbinary</emphasis> is\r
        used. See <xref linkend="gitattributes(5)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitcvs.allbinary\r
</term>\r
<listitem>\r
<simpara>\r
        This is used if <emphasis>gitcvs.usecrlfattr</emphasis> does not resolve\r
        the correct <emphasis>-kb</emphasis> mode to use. If true, all\r
        unresolved files are sent to the client in\r
        mode <emphasis>-kb</emphasis>. This causes the client to treat them\r
        as binary files, which suppresses any newline munging it\r
        otherwise might do. Alternatively, if it is set to "guess",\r
        then the contents of the file are examined to decide if\r
        it is binary, similar to <emphasis>core.autocrlf</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitcvs.dbname\r
</term>\r
<listitem>\r
<simpara>\r
        Database used by git-cvsserver to cache revision information\r
        derived from the git repository. The exact meaning depends on the\r
        used database driver, for SQLite (which is the default driver) this\r
        is a filename. Supports variable substitution (see\r
        <xref linkend="git-cvsserver(1)" /> for details). May not contain semicolons (<emphasis>;</emphasis>).\r
        Default: <emphasis>%Ggitcvs.%m.sqlite</emphasis>\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitcvs.dbdriver\r
</term>\r
<listitem>\r
<simpara>\r
        Used Perl DBI driver. You can specify any available driver\r
        for this here, but it might not work. git-cvsserver is tested\r
        with <emphasis>DBD::SQLite</emphasis>, reported to work with <emphasis>DBD::Pg</emphasis>, and\r
        reported <emphasis role="strong">not</emphasis> to work with <emphasis>DBD::mysql</emphasis>. Experimental feature.\r
        May not contain double colons (<emphasis>:</emphasis>). Default: <emphasis>SQLite</emphasis>.\r
        See <xref linkend="git-cvsserver(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitcvs.dbuser, gitcvs.dbpass\r
</term>\r
<listitem>\r
<simpara>\r
        Database user and password. Only useful if setting <emphasis>gitcvs.dbdriver</emphasis>,\r
        since SQLite has no concept of database users and/or passwords.\r
        <emphasis>gitcvs.dbuser</emphasis> supports variable substitution (see\r
        <xref linkend="git-cvsserver(1)" /> for details).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitcvs.dbTableNamePrefix\r
</term>\r
<listitem>\r
<simpara>\r
        Database table name prefix.  Prepended to the names of any\r
        database tables used, allowing a single database to be used\r
        for several repositories.  Supports variable substitution (see\r
        <xref linkend="git-cvsserver(1)" /> for details).  Any non-alphabetic\r
        characters will be replaced with underscores.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
<simpara>All gitcvs variables except for <emphasis>gitcvs.usecrlfattr</emphasis> and\r
<emphasis>gitcvs.allbinary</emphasis> can also be specified as\r
<emphasis>gitcvs.&lt;access_method&gt;.&lt;varname&gt;</emphasis> (where <emphasis>access_method</emphasis>\r
is one of "ext" and "pserver") to make them apply only for the given\r
access method.</simpara>\r
<variablelist>\r
<varlistentry>\r
<term>\r
gitweb.category\r
</term>\r
<term>\r
gitweb.description\r
</term>\r
<term>\r
gitweb.owner\r
</term>\r
<term>\r
gitweb.url\r
</term>\r
<listitem>\r
<simpara>\r
        See <xref linkend="gitweb(1)" /> for description.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gitweb.avatar\r
</term>\r
<term>\r
gitweb.blame\r
</term>\r
<term>\r
gitweb.grep\r
</term>\r
<term>\r
gitweb.highlight\r
</term>\r
<term>\r
gitweb.patches\r
</term>\r
<term>\r
gitweb.pickaxe\r
</term>\r
<term>\r
gitweb.remote_heads\r
</term>\r
<term>\r
gitweb.showsizes\r
</term>\r
<term>\r
gitweb.snapshot\r
</term>\r
<listitem>\r
<simpara>\r
        See <xref linkend="gitweb.conf(5)" /> for description.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
grep.lineNumber\r
</term>\r
<listitem>\r
<simpara>\r
        If set to true, enable <emphasis>-n</emphasis> option by default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
grep.patternType\r
</term>\r
<listitem>\r
<simpara>\r
        Set the default matching behavior. Using a value of <emphasis>basic</emphasis>, <emphasis>extended</emphasis>,\r
        <emphasis>fixed</emphasis>, or <emphasis>perl</emphasis> will enable the <emphasis>--basic-regexp</emphasis>, <emphasis>--extended-regexp</emphasis>,\r
        <emphasis>--fixed-strings</emphasis>, or <emphasis>--perl-regexp</emphasis> option accordingly, while the\r
        value <emphasis>default</emphasis> will return to the default matching behavior.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
grep.extendedRegexp\r
</term>\r
<listitem>\r
<simpara>\r
        If set to true, enable <emphasis>--extended-regexp</emphasis> option by default. This\r
        option is ignored when the <emphasis>grep.patternType</emphasis> option is set to a value\r
        other than <emphasis>default</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gpg.program\r
</term>\r
<listitem>\r
<simpara>\r
        Use this custom program instead of "gpg" found on $PATH when\r
        making or verifying a PGP signature. The program must support the\r
        same command line interface as GPG, namely, to verify a detached\r
        signature, "gpg --verify $file - &lt;$signature" is run, and the\r
        program is expected to signal a good signature by exiting with\r
        code 0, and to generate an ascii-armored detached signature, the\r
        standard input of "gpg -bsau $key" is fed with the contents to be\r
        signed, and the program is expected to send the result to its\r
        standard output.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.commitmsgwidth\r
</term>\r
<listitem>\r
<simpara>\r
        Defines how wide the commit message window is in the\r
        <xref linkend="git-gui(1)" />. "75" is the default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.diffcontext\r
</term>\r
<listitem>\r
<simpara>\r
        Specifies how many context lines should be used in calls to diff\r
        made by the <xref linkend="git-gui(1)" />. The default is "5".\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.encoding\r
</term>\r
<listitem>\r
<simpara>\r
        Specifies the default encoding to use for displaying of\r
        file contents in <xref linkend="git-gui(1)" /> and <xref linkend="gitk(1)" />.\r
        It can be overridden by setting the <emphasis>encoding</emphasis> attribute\r
        for relevant files (see <xref linkend="gitattributes(5)" />).\r
        If this option is not set, the tools default to the\r
        locale encoding.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.matchtrackingbranch\r
</term>\r
<listitem>\r
<simpara>\r
        Determines if new branches created with <xref linkend="git-gui(1)" /> should\r
        default to tracking remote branches with matching names or\r
        not. Default: "false".\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.newbranchtemplate\r
</term>\r
<listitem>\r
<simpara>\r
        Is used as suggested name when creating new branches using the\r
        <xref linkend="git-gui(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.pruneduringfetch\r
</term>\r
<listitem>\r
<simpara>\r
        "true" if <xref linkend="git-gui(1)" /> should prune remote-tracking branches when\r
        performing a fetch. The default value is "false".\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.trustmtime\r
</term>\r
<listitem>\r
<simpara>\r
        Determines if <xref linkend="git-gui(1)" /> should trust the file modification\r
        timestamp or not. By default the timestamps are not trusted.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.spellingdictionary\r
</term>\r
<listitem>\r
<simpara>\r
        Specifies the dictionary used for spell checking commit messages in\r
        the <xref linkend="git-gui(1)" />. When set to "none" spell checking is turned\r
        off.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.fastcopyblame\r
</term>\r
<listitem>\r
<simpara>\r
        If true, <emphasis>git gui blame</emphasis> uses <emphasis>-C</emphasis> instead of <emphasis>-C -C</emphasis> for original\r
        location detection. It makes blame significantly faster on huge\r
        repositories at the expense of less thorough copy detection.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.copyblamethreshold\r
</term>\r
<listitem>\r
<simpara>\r
        Specifies the threshold to use in <emphasis>git gui blame</emphasis> original location\r
        detection, measured in alphanumeric characters. See the\r
        <xref linkend="git-blame(1)" /> manual for more information on copy detection.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
gui.blamehistoryctx\r
</term>\r
<listitem>\r
<simpara>\r
        Specifies the radius of history context in days to show in\r
        <xref linkend="gitk(1)" /> for the selected commit, when the <emphasis>Show History\r
        Context</emphasis> menu item is invoked from <emphasis>git gui blame</emphasis>. If this\r
        variable is set to zero, the whole history is shown.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.cmd\r
</term>\r
<listitem>\r
<simpara>\r
        Specifies the shell command line to execute when the corresponding item\r
        of the <xref linkend="git-gui(1)" /> <emphasis>Tools</emphasis> menu is invoked. This option is\r
        mandatory for every tool. The command is executed from the root of\r
        the working directory, and in the environment it receives the name of\r
        the tool as <emphasis>GIT_GUITOOL</emphasis>, the name of the currently selected file as\r
        <emphasis>FILENAME</emphasis>, and the name of the current branch as <emphasis>CUR_BRANCH</emphasis> (if\r
        the head is detached, <emphasis>CUR_BRANCH</emphasis> is empty).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.needsfile\r
</term>\r
<listitem>\r
<simpara>\r
        Run the tool only if a diff is selected in the GUI. It guarantees\r
        that <emphasis>FILENAME</emphasis> is not empty.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.noconsole\r
</term>\r
<listitem>\r
<simpara>\r
        Run the command silently, without creating a window to display its\r
        output.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.norescan\r
</term>\r
<listitem>\r
<simpara>\r
        Don't rescan the working directory for changes after the tool\r
        finishes execution.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.confirm\r
</term>\r
<listitem>\r
<simpara>\r
        Show a confirmation dialog before actually running the tool.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.argprompt\r
</term>\r
<listitem>\r
<simpara>\r
        Request a string argument from the user, and pass it to the tool\r
        through the <emphasis>ARGS</emphasis> environment variable. Since requesting an\r
        argument implies confirmation, the <emphasis>confirm</emphasis> option has no effect\r
        if this is enabled. If the option is set to <emphasis>true</emphasis>, <emphasis>yes</emphasis>, or <emphasis>1</emphasis>,\r
        the dialog uses a built-in generic prompt; otherwise the exact\r
        value of the variable is used.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.revprompt\r
</term>\r
<listitem>\r
<simpara>\r
        Request a single valid revision from the user, and set the\r
        <emphasis>REVISION</emphasis> environment variable. In other aspects this option\r
        is similar to <emphasis>argprompt</emphasis>, and can be used together with it.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.revunmerged\r
</term>\r
<listitem>\r
<simpara>\r
        Show only unmerged branches in the <emphasis>revprompt</emphasis> subdialog.\r
        This is useful for tools similar to merge or rebase, but not\r
        for things like checkout or reset.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.title\r
</term>\r
<listitem>\r
<simpara>\r
        Specifies the title to use for the prompt dialog. The default\r
        is the tool name.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
guitool.&lt;name&gt;.prompt\r
</term>\r
<listitem>\r
<simpara>\r
        Specifies the general prompt string to display at the top of\r
        the dialog, before subsections for <emphasis>argprompt</emphasis> and <emphasis>revprompt</emphasis>.\r
        The default value includes the actual command.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
help.browser\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the browser that will be used to display help in the\r
        <emphasis>web</emphasis> format. See <xref linkend="git-help(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
help.format\r
</term>\r
<listitem>\r
<simpara>\r
        Override the default help format used by <xref linkend="git-help(1)" />.\r
        Values <emphasis>man</emphasis>, <emphasis>info</emphasis>, <emphasis>web</emphasis> and <emphasis>html</emphasis> are supported. <emphasis>man</emphasis> is\r
        the default. <emphasis>web</emphasis> and <emphasis>html</emphasis> are the same.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
help.autocorrect\r
</term>\r
<listitem>\r
<simpara>\r
        Automatically correct and execute mistyped commands after\r
        waiting for the given number of deciseconds (0.1 sec). If more\r
        than one command can be deduced from the entered text, nothing\r
        will be executed.  If the value of this option is negative,\r
        the corrected command will be executed immediately. If the\r
        value is 0 - the command will be just shown but not executed.\r
        This is the default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.proxy\r
</term>\r
<listitem>\r
<simpara>\r
        Override the HTTP proxy, normally configured using the <emphasis>http_proxy</emphasis>,\r
        <emphasis>https_proxy</emphasis>, and <emphasis>all_proxy</emphasis> environment variables (see\r
        <emphasis>curl(1)</emphasis>).  This can be overridden on a per-remote basis; see\r
        remote.&lt;name&gt;.proxy\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.cookiefile\r
</term>\r
<listitem>\r
<simpara>\r
        File containing previously stored cookie lines which should be used\r
        in the git http session, if they match the server. The file format\r
        of the file to read cookies from should be plain HTTP headers or\r
        the Netscape/Mozilla cookie file format (see <xref linkend="curl(1)" />).\r
        NOTE that the file specified with http.cookiefile is only used as\r
        input. No cookies will be stored in the file.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.sslVerify\r
</term>\r
<listitem>\r
<simpara>\r
        Whether to verify the SSL certificate when fetching or pushing\r
        over HTTPS. Can be overridden by the <emphasis>GIT_SSL_NO_VERIFY</emphasis> environment\r
        variable.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.sslCert\r
</term>\r
<listitem>\r
<simpara>\r
        File containing the SSL certificate when fetching or pushing\r
        over HTTPS. Can be overridden by the <emphasis>GIT_SSL_CERT</emphasis> environment\r
        variable.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.sslKey\r
</term>\r
<listitem>\r
<simpara>\r
        File containing the SSL private key when fetching or pushing\r
        over HTTPS. Can be overridden by the <emphasis>GIT_SSL_KEY</emphasis> environment\r
        variable.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.sslCertPasswordProtected\r
</term>\r
<listitem>\r
<simpara>\r
        Enable git's password prompt for the SSL certificate.  Otherwise\r
        OpenSSL will prompt the user, possibly many times, if the\r
        certificate or private key is encrypted.  Can be overridden by the\r
        <emphasis>GIT_SSL_CERT_PASSWORD_PROTECTED</emphasis> environment variable.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.sslCAInfo\r
</term>\r
<listitem>\r
<simpara>\r
        File containing the certificates to verify the peer with when\r
        fetching or pushing over HTTPS. Can be overridden by the\r
        <emphasis>GIT_SSL_CAINFO</emphasis> environment variable.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.sslCAPath\r
</term>\r
<listitem>\r
<simpara>\r
        Path containing files with the CA certificates to verify the peer\r
        with when fetching or pushing over HTTPS. Can be overridden\r
        by the <emphasis>GIT_SSL_CAPATH</emphasis> environment variable.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.maxRequests\r
</term>\r
<listitem>\r
<simpara>\r
        How many HTTP requests to launch in parallel. Can be overridden\r
        by the <emphasis>GIT_HTTP_MAX_REQUESTS</emphasis> environment variable. Default is 5.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.minSessions\r
</term>\r
<listitem>\r
<simpara>\r
        The number of curl sessions (counted across slots) to be kept across\r
        requests. They will not be ended with curl_easy_cleanup() until\r
        http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this\r
        value will be capped at 1. Defaults to 1.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.postBuffer\r
</term>\r
<listitem>\r
<simpara>\r
        Maximum size in bytes of the buffer used by smart HTTP\r
        transports when POSTing data to the remote system.\r
        For requests larger than this buffer size, HTTP/1.1 and\r
        Transfer-Encoding: chunked is used to avoid creating a\r
        massive pack file locally.  Default is 1 MiB, which is\r
        sufficient for most requests.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.lowSpeedLimit, http.lowSpeedTime\r
</term>\r
<listitem>\r
<simpara>\r
        If the HTTP transfer speed is less than <emphasis>http.lowSpeedLimit</emphasis>\r
        for longer than <emphasis>http.lowSpeedTime</emphasis> seconds, the transfer is aborted.\r
        Can be overridden by the <emphasis>GIT_HTTP_LOW_SPEED_LIMIT</emphasis> and\r
        <emphasis>GIT_HTTP_LOW_SPEED_TIME</emphasis> environment variables.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.noEPSV\r
</term>\r
<listitem>\r
<simpara>\r
        A boolean which disables using of EPSV ftp command by curl.\r
        This can helpful with some "poor" ftp servers which don't\r
        support EPSV mode. Can be overridden by the <emphasis>GIT_CURL_FTP_NO_EPSV</emphasis>\r
        environment variable. Default is false (curl will use EPSV).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
http.useragent\r
</term>\r
<listitem>\r
<simpara>\r
        The HTTP USER_AGENT string presented to an HTTP server.  The default\r
        value represents the version of the client git such as git/1.7.1.\r
        This option allows you to override this value to a more common value\r
        such as Mozilla/4.0.  This may be necessary, for instance, if\r
        connecting through a firewall that restricts HTTP connections to a set\r
        of common USER_AGENT strings (but not including those like git/1.7.1).\r
        Can be overridden by the <emphasis>GIT_HTTP_USER_AGENT</emphasis> environment variable.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
i18n.commitEncoding\r
</term>\r
<listitem>\r
<simpara>\r
        Character encoding the commit messages are stored in; git itself\r
        does not care per se, but this information is necessary e.g. when\r
        importing commits from emails or in the gitk graphical history\r
        browser (and possibly at other places in the future or in other\r
        porcelains). See e.g. <xref linkend="git-mailinfo(1)" />. Defaults to <emphasis>utf-8</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
i18n.logOutputEncoding\r
</term>\r
<listitem>\r
<simpara>\r
        Character encoding the commit messages are converted to when\r
        running <emphasis>git log</emphasis> and friends.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
imap\r
</term>\r
<listitem>\r
<simpara>\r
        The configuration variables in the <emphasis>imap</emphasis> section are described\r
        in <xref linkend="git-imap-send(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
init.templatedir\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the directory from which templates will be copied.\r
        (See the "TEMPLATE DIRECTORY" section of <xref linkend="git-init(1)" />.)\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
instaweb.browser\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the program that will be used to browse your working\r
        repository in gitweb. See <xref linkend="git-instaweb(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
instaweb.httpd\r
</term>\r
<listitem>\r
<simpara>\r
        The HTTP daemon command-line to start gitweb on your working\r
        repository. See <xref linkend="git-instaweb(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
instaweb.local\r
</term>\r
<listitem>\r
<simpara>\r
        If true the web server started by <xref linkend="git-instaweb(1)" /> will\r
        be bound to the local IP (127.0.0.1).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
instaweb.modulepath\r
</term>\r
<listitem>\r
<simpara>\r
        The default module path for <xref linkend="git-instaweb(1)" /> to use\r
        instead of /usr/lib/apache2/modules.  Only used if httpd\r
        is Apache.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
instaweb.port\r
</term>\r
<listitem>\r
<simpara>\r
        The port number to bind the gitweb httpd to. See\r
        <xref linkend="git-instaweb(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
interactive.singlekey\r
</term>\r
<listitem>\r
<simpara>\r
        In interactive commands, allow the user to provide one-letter\r
        input with a single key (i.e., without hitting enter).\r
        Currently this is used by the <emphasis>--patch</emphasis> mode of\r
        <xref linkend="git-add(1)" />, <xref linkend="git-checkout(1)" />, <xref linkend="git-commit(1)" />,\r
        <xref linkend="git-reset(1)" />, and <xref linkend="git-stash(1)" />. Note that this\r
        setting is silently ignored if portable keystroke input\r
        is not available.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
log.abbrevCommit\r
</term>\r
<listitem>\r
<simpara>\r
        If true, makes <xref linkend="git-log(1)" />, <xref linkend="git-show(1)" />, and\r
        <xref linkend="git-whatchanged(1)" /> assume <emphasis>--abbrev-commit</emphasis>. You may\r
        override this option with <emphasis>--no-abbrev-commit</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
log.date\r
</term>\r
<listitem>\r
<simpara>\r
        Set the default date-time mode for the <emphasis>log</emphasis> command.\r
        Setting a value for log.date is similar to using <emphasis>git log</emphasis>'s\r
        <emphasis>--date</emphasis> option.  Possible values are <emphasis>relative</emphasis>, <emphasis>local</emphasis>,\r
        <emphasis>default</emphasis>, <emphasis>iso</emphasis>, <emphasis>rfc</emphasis>, and <emphasis>short</emphasis>; see <xref linkend="git-log(1)" />\r
        for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
log.decorate\r
</term>\r
<listitem>\r
<simpara>\r
        Print out the ref names of any commits that are shown by the log\r
        command. If <emphasis>short</emphasis> is specified, the ref name prefixes <emphasis>refs/heads/</emphasis>,\r
        <emphasis>refs/tags/</emphasis> and <emphasis>refs/remotes/</emphasis> will not be printed. If <emphasis>full</emphasis> is\r
        specified, the full ref name (including prefix) will be printed.\r
        This is the same as the log commands <emphasis>--decorate</emphasis> option.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
log.showroot\r
</term>\r
<listitem>\r
<simpara>\r
        If true, the initial commit will be shown as a big creation event.\r
        This is equivalent to a diff against an empty tree.\r
        Tools like <xref linkend="git-log(1)" /> or <xref linkend="git-whatchanged(1)" />, which\r
        normally hide the root commit will now show it. True by default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
mailmap.file\r
</term>\r
<listitem>\r
<simpara>\r
        The location of an augmenting mailmap file. The default\r
        mailmap, located in the root of the repository, is loaded\r
        first, then the mailmap file pointed to by this variable.\r
        The location of the mailmap file may be in a repository\r
        subdirectory, or somewhere outside of the repository itself.\r
        See <xref linkend="git-shortlog(1)" /> and <xref linkend="git-blame(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
man.viewer\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the programs that may be used to display help in the\r
        <emphasis>man</emphasis> format. See <xref linkend="git-help(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
man.&lt;tool&gt;.cmd\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the command to invoke the specified man viewer. The\r
        specified command is evaluated in shell with the man page\r
        passed as argument. (See <xref linkend="git-help(1)" />.)\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
man.&lt;tool&gt;.path\r
</term>\r
<listitem>\r
<simpara>\r
        Override the path for the given tool that may be used to\r
        display help in the <emphasis>man</emphasis> format. See <xref linkend="git-help(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.conflictstyle\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the style in which conflicted hunks are written out to\r
        working tree files upon merge.  The default is "merge", which\r
        shows a <emphasis>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</emphasis> conflict marker, changes made by one side,\r
        a <emphasis>=======</emphasis> marker, changes made by the other side, and then\r
        a <emphasis>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</emphasis> marker.  An alternate style, "diff3", adds a <emphasis>|||||||</emphasis>\r
        marker and the original text before the <emphasis>=======</emphasis> marker.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.defaultToUpstream\r
</term>\r
<listitem>\r
<simpara>\r
        If merge is called without any commit argument, merge the upstream\r
        branches configured for the current branch by using their last\r
        observed values stored in their remote-tracking branches.\r
        The values of the <emphasis>branch.&lt;current branch&gt;.merge</emphasis> that name the\r
        branches at the remote named by <emphasis>branch.&lt;current branch&gt;.remote</emphasis>\r
        are consulted, and then they are mapped via <emphasis>remote.&lt;remote&gt;.fetch</emphasis>\r
        to their corresponding remote-tracking branches, and the tips of\r
        these tracking branches are merged.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.ff\r
</term>\r
<listitem>\r
<simpara>\r
        By default, git does not create an extra merge commit when merging\r
        a commit that is a descendant of the current commit. Instead, the\r
        tip of the current branch is fast-forwarded. When set to <emphasis>false</emphasis>,\r
        this variable tells git to create an extra merge commit in such\r
        a case (equivalent to giving the <emphasis>--no-ff</emphasis> option from the command\r
        line). When set to <emphasis>only</emphasis>, only such fast-forward merges are\r
        allowed (equivalent to giving the <emphasis>--ff-only</emphasis> option from the\r
        command line).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.log\r
</term>\r
<listitem>\r
<simpara>\r
        In addition to branch names, populate the log message with at\r
        most the specified number of one-line descriptions from the\r
        actual commits that are being merged.  Defaults to false, and\r
        true is a synonym for 20.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.renameLimit\r
</term>\r
<listitem>\r
<simpara>\r
        The number of files to consider when performing rename detection\r
        during a merge; if not specified, defaults to the value of\r
        diff.renameLimit.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.renormalize\r
</term>\r
<listitem>\r
<simpara>\r
        Tell git that canonical representation of files in the\r
        repository has changed over time (e.g. earlier commits record\r
        text files with CRLF line endings, but recent ones use LF line\r
        endings).  In such a repository, git can convert the data\r
        recorded in commits to a canonical form before performing a\r
        merge to reduce unnecessary conflicts.  For more information,\r
        see section "Merging branches with differing checkin/checkout\r
        attributes" in <xref linkend="gitattributes(5)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.stat\r
</term>\r
<listitem>\r
<simpara>\r
        Whether to print the diffstat between ORIG_HEAD and the merge result\r
        at the end of the merge.  True by default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.tool\r
</term>\r
<listitem>\r
<simpara>\r
        Controls which merge resolution program is used by\r
        <xref linkend="git-mergetool(1)" />.  Valid built-in values are: "araxis",\r
        "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld",\r
        "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff"\r
        and "xxdiff".  Any other value is treated is custom merge tool\r
        and there must be a corresponding mergetool.&lt;tool&gt;.cmd option.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.verbosity\r
</term>\r
<listitem>\r
<simpara>\r
        Controls the amount of output shown by the recursive merge\r
        strategy.  Level 0 outputs nothing except a final error\r
        message if conflicts were detected. Level 1 outputs only\r
        conflicts, 2 outputs conflicts and file changes.  Level 5 and\r
        above outputs debugging information.  The default is level 2.\r
        Can be overridden by the <emphasis>GIT_MERGE_VERBOSITY</emphasis> environment variable.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.&lt;driver&gt;.name\r
</term>\r
<listitem>\r
<simpara>\r
        Defines a human-readable name for a custom low-level\r
        merge driver.  See <xref linkend="gitattributes(5)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.&lt;driver&gt;.driver\r
</term>\r
<listitem>\r
<simpara>\r
        Defines the command that implements a custom low-level\r
        merge driver.  See <xref linkend="gitattributes(5)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
merge.&lt;driver&gt;.recursive\r
</term>\r
<listitem>\r
<simpara>\r
        Names a low-level merge driver to be used when\r
        performing an internal merge between common ancestors.\r
        See <xref linkend="gitattributes(5)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
mergetool.&lt;tool&gt;.path\r
</term>\r
<listitem>\r
<simpara>\r
        Override the path for the given tool.  This is useful in case\r
        your tool is not in the PATH.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
mergetool.&lt;tool&gt;.cmd\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the command to invoke the specified merge tool.  The\r
        specified command is evaluated in shell with the following\r
        variables available: <emphasis>BASE</emphasis> is the name of a temporary file\r
        containing the common base of the files to be merged, if available;\r
        <emphasis>LOCAL</emphasis> is the name of a temporary file containing the contents of\r
        the file on the current branch; <emphasis>REMOTE</emphasis> is the name of a temporary\r
        file containing the contents of the file from the branch being\r
        merged; <emphasis>MERGED</emphasis> contains the name of the file to which the merge\r
        tool should write the results of a successful merge.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
mergetool.&lt;tool&gt;.trustExitCode\r
</term>\r
<listitem>\r
<simpara>\r
        For a custom merge command, specify whether the exit code of\r
        the merge command can be used to determine whether the merge was\r
        successful.  If this is not set to true then the merge target file\r
        timestamp is checked and the merge assumed to have been successful\r
        if the file has been updated, otherwise the user is prompted to\r
        indicate the success of the merge.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
mergetool.keepBackup\r
</term>\r
<listitem>\r
<simpara>\r
        After performing a merge, the original file with conflict markers\r
        can be saved as a file with a <emphasis>.orig</emphasis> extension.  If this variable\r
        is set to <emphasis>false</emphasis> then this file is not preserved.  Defaults to\r
        <emphasis>true</emphasis> (i.e. keep the backup files).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
mergetool.keepTemporaries\r
</term>\r
<listitem>\r
<simpara>\r
        When invoking a custom merge tool, git uses a set of temporary\r
        files to pass to the tool. If the tool returns an error and this\r
        variable is set to <emphasis>true</emphasis>, then these temporary files will be\r
        preserved, otherwise they will be removed after the tool has\r
        exited. Defaults to <emphasis>false</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
mergetool.prompt\r
</term>\r
<listitem>\r
<simpara>\r
        Prompt before each invocation of the merge resolution program.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
notes.displayRef\r
</term>\r
<listitem>\r
<simpara>\r
        The (fully qualified) refname from which to show notes when\r
        showing commit messages.  The value of this variable can be set\r
        to a glob, in which case notes from all matching refs will be\r
        shown.  You may also specify this configuration variable\r
        several times.  A warning will be issued for refs that do not\r
        exist, but a glob that does not match any refs is silently\r
        ignored.\r
</simpara>\r
<simpara>This setting can be overridden with the <emphasis>GIT_NOTES_DISPLAY_REF</emphasis>\r
environment variable, which must be a colon separated list of refs or\r
globs.</simpara>\r
<simpara>The effective value of "core.notesRef" (possibly overridden by\r
GIT_NOTES_REF) is also implicitly added to the list of refs to be\r
displayed.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
notes.rewrite.&lt;command&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        When rewriting commits with &lt;command&gt; (currently <emphasis>amend</emphasis> or\r
        <emphasis>rebase</emphasis>) and this variable is set to <emphasis>true</emphasis>, git\r
        automatically copies your notes from the original to the\r
        rewritten commit.  Defaults to <emphasis>true</emphasis>, but see\r
        "notes.rewriteRef" below.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
notes.rewriteMode\r
</term>\r
<listitem>\r
<simpara>\r
        When copying notes during a rewrite (see the\r
        "notes.rewrite.&lt;command&gt;" option), determines what to do if\r
        the target commit already has a note.  Must be one of\r
        <emphasis>overwrite</emphasis>, <emphasis>concatenate</emphasis>, or <emphasis>ignore</emphasis>.  Defaults to\r
        <emphasis>concatenate</emphasis>.\r
</simpara>\r
<simpara>This setting can be overridden with the <emphasis>GIT_NOTES_REWRITE_MODE</emphasis>\r
environment variable.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
notes.rewriteRef\r
</term>\r
<listitem>\r
<simpara>\r
        When copying notes during a rewrite, specifies the (fully\r
        qualified) ref whose notes should be copied.  The ref may be a\r
        glob, in which case notes in all matching refs will be copied.\r
        You may also specify this configuration several times.\r
</simpara>\r
<simpara>Does not have a default value; you must configure this variable to\r
enable note rewriting.  Set it to <emphasis>refs/notes/commits</emphasis> to enable\r
rewriting for the default commit notes.</simpara>\r
<simpara>This setting can be overridden with the <emphasis>GIT_NOTES_REWRITE_REF</emphasis>\r
environment variable, which must be a colon separated list of refs or\r
globs.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pack.window\r
</term>\r
<listitem>\r
<simpara>\r
        The size of the window used by <xref linkend="git-pack-objects(1)" /> when no\r
        window size is given on the command line. Defaults to 10.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pack.depth\r
</term>\r
<listitem>\r
<simpara>\r
        The maximum delta depth used by <xref linkend="git-pack-objects(1)" /> when no\r
        maximum depth is given on the command line. Defaults to 50.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pack.windowMemory\r
</term>\r
<listitem>\r
<simpara>\r
        The window memory size limit used by <xref linkend="git-pack-objects(1)" />\r
        when no limit is given on the command line.  The value can be\r
        suffixed with "k", "m", or "g".  Defaults to 0, meaning no\r
        limit.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pack.compression\r
</term>\r
<listitem>\r
<simpara>\r
        An integer -1..9, indicating the compression level for objects\r
        in a pack file. -1 is the zlib default. 0 means no\r
        compression, and 1..9 are various speed/size tradeoffs, 9 being\r
        slowest.  If not set,  defaults to core.compression.  If that is\r
        not set,  defaults to -1, the zlib default, which is "a default\r
        compromise between speed and compression (currently equivalent\r
        to level 6)."\r
</simpara>\r
<simpara>Note that changing the compression level will not automatically recompress\r
all existing objects. You can force recompression by passing the -F option\r
to <xref linkend="git-repack(1)" />.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pack.deltaCacheSize\r
</term>\r
<listitem>\r
<simpara>\r
        The maximum memory in bytes used for caching deltas in\r
        <xref linkend="git-pack-objects(1)" /> before writing them out to a pack.\r
        This cache is used to speed up the writing object phase by not\r
        having to recompute the final delta result once the best match\r
        for all objects is found.  Repacking large repositories on machines\r
        which are tight with memory might be badly impacted by this though,\r
        especially if this cache pushes the system into swapping.\r
        A value of 0 means no limit. The smallest size of 1 byte may be\r
        used to virtually disable this cache. Defaults to 256 MiB.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pack.deltaCacheLimit\r
</term>\r
<listitem>\r
<simpara>\r
        The maximum size of a delta, that is cached in\r
        <xref linkend="git-pack-objects(1)" />. This cache is used to speed up the\r
        writing object phase by not having to recompute the final delta\r
        result once the best match for all objects is found. Defaults to 1000.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pack.threads\r
</term>\r
<listitem>\r
<simpara>\r
        Specifies the number of threads to spawn when searching for best\r
        delta matches.  This requires that <xref linkend="git-pack-objects(1)" />\r
        be compiled with pthreads otherwise this option is ignored with a\r
        warning. This is meant to reduce packing time on multiprocessor\r
        machines. The required amount of memory for the delta search window\r
        is however multiplied by the number of threads.\r
        Specifying 0 will cause git to auto-detect the number of CPU's\r
        and set the number of threads accordingly.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pack.indexVersion\r
</term>\r
<listitem>\r
<simpara>\r
        Specify the default pack index version.  Valid values are 1 for\r
        legacy pack index used by Git versions prior to 1.5.2, and 2 for\r
        the new pack index with capabilities for packs larger than 4 GB\r
        as well as proper protection against the repacking of corrupted\r
        packs.  Version 2 is the default.  Note that version 2 is enforced\r
        and this config option ignored whenever the corresponding pack is\r
        larger than 2 GB.\r
</simpara>\r
<simpara>If you have an old git that does not understand the version 2 <emphasis>*.idx</emphasis> file,\r
cloning or fetching over a non native protocol (e.g. "http" and "rsync")\r
that will copy both <emphasis>*.pack</emphasis> file and corresponding <emphasis>*.idx</emphasis> file from the\r
other side may give you a repository that cannot be accessed with your\r
older version of git. If the <emphasis>*.pack</emphasis> file is smaller than 2 GB, however,\r
you can use <xref linkend="git-index-pack(1)" /> on the *.pack file to regenerate\r
the <emphasis>*.idx</emphasis> file.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pack.packSizeLimit\r
</term>\r
<listitem>\r
<simpara>\r
        The maximum size of a pack.  This setting only affects\r
        packing to a file when repacking, i.e. the git:// protocol\r
        is unaffected.  It can be overridden by the <emphasis>--max-pack-size</emphasis>\r
        option of <xref linkend="git-repack(1)" />. The minimum size allowed is\r
        limited to 1 MiB. The default is unlimited.\r
        Common unit suffixes of <emphasis>k</emphasis>, <emphasis>m</emphasis>, or <emphasis>g</emphasis> are\r
        supported.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pager.&lt;cmd&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        If the value is boolean, turns on or off pagination of the\r
        output of a particular git subcommand when writing to a tty.\r
        Otherwise, turns on pagination for the subcommand using the\r
        pager specified by the value of <emphasis>pager.&lt;cmd&gt;</emphasis>.  If <emphasis>--paginate</emphasis>\r
        or <emphasis>--no-pager</emphasis> is specified on the command line, it takes\r
        precedence over this option.  To disable pagination for all\r
        commands, set <emphasis>core.pager</emphasis> or <emphasis>GIT_PAGER</emphasis> to <emphasis>cat</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pretty.&lt;name&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        Alias for a --pretty= format string, as specified in\r
        <xref linkend="git-log(1)" />. Any aliases defined here can be used just\r
        as the built-in pretty formats could. For example,\r
        running <emphasis>git config pretty.changelog "format:* %H %s"</emphasis>\r
        would cause the invocation <emphasis>git log --pretty=changelog</emphasis>\r
        to be equivalent to running <emphasis>git log "--pretty=format:* %H %s"</emphasis>.\r
        Note that an alias with the same name as a built-in format\r
        will be silently ignored.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pull.rebase\r
</term>\r
<listitem>\r
<simpara>\r
        When true, rebase branches on top of the fetched branch, instead\r
        of merging the default branch from the default remote when "git\r
        pull" is run. See "branch.&lt;name&gt;.rebase" for setting this on a\r
        per-branch basis.\r
</simpara>\r
<simpara><emphasis role="strong">NOTE</emphasis>: this is a possibly dangerous operation; do <emphasis role="strong">not</emphasis> use\r
it unless you understand the implications (see <xref linkend="git-rebase(1)" />\r
for details).</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pull.octopus\r
</term>\r
<listitem>\r
<simpara>\r
        The default merge strategy to use when pulling multiple branches\r
        at once.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
pull.twohead\r
</term>\r
<listitem>\r
<simpara>\r
        The default merge strategy to use when pulling a single branch.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
push.default\r
</term>\r
<listitem>\r
<simpara>\r
        Defines the action git push should take if no refspec is given\r
        on the command line, no refspec is configured in the remote, and\r
        no refspec is implied by any of the options given on the command\r
        line. Possible values are:\r
</simpara>\r
<itemizedlist>\r
<listitem>\r
<simpara>\r
<emphasis>nothing</emphasis> - do not push anything.\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>matching</emphasis> - push all branches having the same name in both ends.\r
  This is for those who prepare all the branches into a publishable\r
  shape and then push them out with a single command.  It is not\r
  appropriate for pushing into a repository shared by multiple users,\r
  since locally stalled branches will attempt a non-fast forward push\r
  if other users updated the branch.\r
 <?asciidoc-br?>\r
  This is currently the default, but Git 2.0 will change the default\r
  to <emphasis>simple</emphasis>.\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>upstream</emphasis> - push the current branch to its upstream branch.\r
  With this, <emphasis>git push</emphasis> will update the same remote ref as the one which\r
  is merged by <emphasis>git pull</emphasis>, making <emphasis>push</emphasis> and <emphasis>pull</emphasis> symmetrical.\r
  See "branch.&lt;name&gt;.merge" for how to configure the upstream branch.\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>simple</emphasis> - like <emphasis>upstream</emphasis>, but refuses to push if the upstream\r
  branch's name is different from the local one. This is the safest\r
  option and is well-suited for beginners. It will become the default\r
  in Git 2.0.\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>current</emphasis> - push the current branch to a branch of the same name.\r
</simpara>\r
</listitem>\r
</itemizedlist>\r
<simpara>The <emphasis>simple</emphasis>, <emphasis>current</emphasis> and <emphasis>upstream</emphasis> modes are for those who want to\r
push out a single branch after finishing work, even when the other\r
branches are not yet ready to be pushed out. If you are working with\r
other people to push into the same shared repository, you would want\r
to use one of these.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
rebase.stat\r
</term>\r
<listitem>\r
<simpara>\r
        Whether to show a diffstat of what changed upstream since the last\r
        rebase. False by default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
rebase.autosquash\r
</term>\r
<listitem>\r
<simpara>\r
        If set to true enable <emphasis>--autosquash</emphasis> option by default.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
receive.autogc\r
</term>\r
<listitem>\r
<simpara>\r
        By default, git-receive-pack will run "git-gc --auto" after\r
        receiving data from git-push and updating refs.  You can stop\r
        it by setting this variable to false.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
receive.fsckObjects\r
</term>\r
<listitem>\r
<simpara>\r
        If it is set to true, git-receive-pack will check all received\r
        objects. It will abort in the case of a malformed object or a\r
        broken link. The result of an abort are only dangling objects.\r
        Defaults to false. If not set, the value of <emphasis>transfer.fsckObjects</emphasis>\r
        is used instead.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
receive.unpackLimit\r
</term>\r
<listitem>\r
<simpara>\r
        If the number of objects received in a push is below this\r
        limit then the objects will be unpacked into loose object\r
        files. However if the number of received objects equals or\r
        exceeds this limit then the received pack will be stored as\r
        a pack, after adding any missing delta bases.  Storing the\r
        pack from a push can make the push operation complete faster,\r
        especially on slow filesystems.  If not set, the value of\r
        <emphasis>transfer.unpackLimit</emphasis> is used instead.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
receive.denyDeletes\r
</term>\r
<listitem>\r
<simpara>\r
        If set to true, git-receive-pack will deny a ref update that deletes\r
        the ref. Use this to prevent such a ref deletion via a push.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
receive.denyDeleteCurrent\r
</term>\r
<listitem>\r
<simpara>\r
        If set to true, git-receive-pack will deny a ref update that\r
        deletes the currently checked out branch of a non-bare repository.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
receive.denyCurrentBranch\r
</term>\r
<listitem>\r
<simpara>\r
        If set to true or "refuse", git-receive-pack will deny a ref update\r
        to the currently checked out branch of a non-bare repository.\r
        Such a push is potentially dangerous because it brings the HEAD\r
        out of sync with the index and working tree. If set to "warn",\r
        print a warning of such a push to stderr, but allow the push to\r
        proceed. If set to false or "ignore", allow such pushes with no\r
        message. Defaults to "refuse".\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
receive.denyNonFastForwards\r
</term>\r
<listitem>\r
<simpara>\r
        If set to true, git-receive-pack will deny a ref update which is\r
        not a fast-forward. Use this to prevent such an update via a push,\r
        even if that push is forced. This configuration variable is\r
        set when initializing a shared repository.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
receive.updateserverinfo\r
</term>\r
<listitem>\r
<simpara>\r
        If set to true, git-receive-pack will run git-update-server-info\r
        after receiving data from git-push and updating refs.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.url\r
</term>\r
<listitem>\r
<simpara>\r
        The URL of a remote repository.  See <xref linkend="git-fetch(1)" /> or\r
        <xref linkend="git-push(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.pushurl\r
</term>\r
<listitem>\r
<simpara>\r
        The push URL of a remote repository.  See <xref linkend="git-push(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.proxy\r
</term>\r
<listitem>\r
<simpara>\r
        For remotes that require curl (http, https and ftp), the URL to\r
        the proxy to use for that remote.  Set to the empty string to\r
        disable proxying for that remote.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.fetch\r
</term>\r
<listitem>\r
<simpara>\r
        The default set of "refspec" for <xref linkend="git-fetch(1)" />. See\r
        <xref linkend="git-fetch(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.push\r
</term>\r
<listitem>\r
<simpara>\r
        The default set of "refspec" for <xref linkend="git-push(1)" />. See\r
        <xref linkend="git-push(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.mirror\r
</term>\r
<listitem>\r
<simpara>\r
        If true, pushing to this remote will automatically behave\r
        as if the <emphasis>--mirror</emphasis> option was given on the command line.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.skipDefaultUpdate\r
</term>\r
<listitem>\r
<simpara>\r
        If true, this remote will be skipped by default when updating\r
        using <xref linkend="git-fetch(1)" /> or the <emphasis>update</emphasis> subcommand of\r
        <xref linkend="git-remote(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.skipFetchAll\r
</term>\r
<listitem>\r
<simpara>\r
        If true, this remote will be skipped by default when updating\r
        using <xref linkend="git-fetch(1)" /> or the <emphasis>update</emphasis> subcommand of\r
        <xref linkend="git-remote(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.receivepack\r
</term>\r
<listitem>\r
<simpara>\r
        The default program to execute on the remote side when pushing.  See\r
        option --receive-pack of <xref linkend="git-push(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.uploadpack\r
</term>\r
<listitem>\r
<simpara>\r
        The default program to execute on the remote side when fetching.  See\r
        option --upload-pack of <xref linkend="git-fetch-pack(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.tagopt\r
</term>\r
<listitem>\r
<simpara>\r
        Setting this value to --no-tags disables automatic tag following when\r
        fetching from remote &lt;name&gt;. Setting it to --tags will fetch every\r
        tag from remote &lt;name&gt;, even if they are not reachable from remote\r
        branch heads. Passing these flags directly to <xref linkend="git-fetch(1)" /> can\r
        override this setting. See options --tags and --no-tags of\r
        <xref linkend="git-fetch(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remote.&lt;name&gt;.vcs\r
</term>\r
<listitem>\r
<simpara>\r
        Setting this to a value &lt;vcs&gt; will cause git to interact with\r
        the remote with the git-remote-&lt;vcs&gt; helper.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
remotes.&lt;group&gt;\r
</term>\r
<listitem>\r
<simpara>\r
        The list of remotes which are fetched by "git remote update\r
        &lt;group&gt;".  See <xref linkend="git-remote(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
repack.usedeltabaseoffset\r
</term>\r
<listitem>\r
<simpara>\r
        By default, <xref linkend="git-repack(1)" /> creates packs that use\r
        delta-base offset. If you need to share your repository with\r
        git older than version 1.4.4, either directly or via a dumb\r
        protocol such as http, then you need to set this option to\r
        "false" and repack. Access from old git versions over the\r
        native protocol are unaffected by this option.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
rerere.autoupdate\r
</term>\r
<listitem>\r
<simpara>\r
        When set to true, <emphasis>git-rerere</emphasis> updates the index with the\r
        resulting contents after it cleanly resolves conflicts using\r
        previously recorded resolution.  Defaults to false.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
rerere.enabled\r
</term>\r
<listitem>\r
<simpara>\r
        Activate recording of resolved conflicts, so that identical\r
        conflict hunks can be resolved automatically, should they be\r
        encountered again.  By default, <xref linkend="git-rerere(1)" /> is\r
        enabled if there is an <emphasis>rr-cache</emphasis> directory under the\r
        <emphasis>$GIT_DIR</emphasis>, e.g. if "rerere" was previously used in the\r
        repository.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
sendemail.identity\r
</term>\r
<listitem>\r
<simpara>\r
        A configuration identity. When given, causes values in the\r
        <emphasis>sendemail.&lt;identity&gt;</emphasis> subsection to take precedence over\r
        values in the <emphasis>sendemail</emphasis> section. The default identity is\r
        the value of <emphasis>sendemail.identity</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
sendemail.smtpencryption\r
</term>\r
<listitem>\r
<simpara>\r
        See <xref linkend="git-send-email(1)" /> for description.  Note that this\r
        setting is not subject to the <emphasis>identity</emphasis> mechanism.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
sendemail.smtpssl\r
</term>\r
<listitem>\r
<simpara>\r
        Deprecated alias for <emphasis>sendemail.smtpencryption = ssl</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
sendemail.&lt;identity&gt;.*\r
</term>\r
<listitem>\r
<simpara>\r
        Identity-specific versions of the <emphasis>sendemail.*</emphasis> parameters\r
        found below, taking precedence over those when the this\r
        identity is selected, through command-line or\r
        <emphasis>sendemail.identity</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
sendemail.aliasesfile\r
</term>\r
<term>\r
sendemail.aliasfiletype\r
</term>\r
<term>\r
sendemail.bcc\r
</term>\r
<term>\r
sendemail.cc\r
</term>\r
<term>\r
sendemail.cccmd\r
</term>\r
<term>\r
sendemail.chainreplyto\r
</term>\r
<term>\r
sendemail.confirm\r
</term>\r
<term>\r
sendemail.envelopesender\r
</term>\r
<term>\r
sendemail.from\r
</term>\r
<term>\r
sendemail.multiedit\r
</term>\r
<term>\r
sendemail.signedoffbycc\r
</term>\r
<term>\r
sendemail.smtppass\r
</term>\r
<term>\r
sendemail.suppresscc\r
</term>\r
<term>\r
sendemail.suppressfrom\r
</term>\r
<term>\r
sendemail.to\r
</term>\r
<term>\r
sendemail.smtpdomain\r
</term>\r
<term>\r
sendemail.smtpserver\r
</term>\r
<term>\r
sendemail.smtpserverport\r
</term>\r
<term>\r
sendemail.smtpserveroption\r
</term>\r
<term>\r
sendemail.smtpuser\r
</term>\r
<term>\r
sendemail.thread\r
</term>\r
<term>\r
sendemail.validate\r
</term>\r
<listitem>\r
<simpara>\r
        See <xref linkend="git-send-email(1)" /> for description.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
sendemail.signedoffcc\r
</term>\r
<listitem>\r
<simpara>\r
        Deprecated alias for <emphasis>sendemail.signedoffbycc</emphasis>.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
showbranch.default\r
</term>\r
<listitem>\r
<simpara>\r
        The default set of branches for <xref linkend="git-show-branch(1)" />.\r
        See <xref linkend="git-show-branch(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
status.relativePaths\r
</term>\r
<listitem>\r
<simpara>\r
        By default, <xref linkend="git-status(1)" /> shows paths relative to the\r
        current directory. Setting this variable to <emphasis>false</emphasis> shows paths\r
        relative to the repository root (this was the default for git\r
        prior to v1.5.4).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
status.showUntrackedFiles\r
</term>\r
<listitem>\r
<simpara>\r
        By default, <xref linkend="git-status(1)" /> and <xref linkend="git-commit(1)" /> show\r
        files which are not currently tracked by Git. Directories which\r
        contain only untracked files, are shown with the directory name\r
        only. Showing untracked files means that Git needs to lstat() all\r
        all the files in the whole repository, which might be slow on some\r
        systems. So, this variable controls how the commands displays\r
        the untracked files. Possible values are:\r
</simpara>\r
<itemizedlist>\r
<listitem>\r
<simpara>\r
<emphasis>no</emphasis> - Show no untracked files.\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>normal</emphasis> - Show untracked files and directories.\r
</simpara>\r
</listitem>\r
<listitem>\r
<simpara>\r
<emphasis>all</emphasis> - Show also individual files in untracked directories.\r
</simpara>\r
</listitem>\r
</itemizedlist>\r
<simpara>If this variable is not specified, it defaults to <emphasis>normal</emphasis>.\r
This variable can be overridden with the -u|--untracked-files option\r
of <xref linkend="git-status(1)" /> and <xref linkend="git-commit(1)" />.</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
status.submodulesummary\r
</term>\r
<listitem>\r
<simpara>\r
        Defaults to false.\r
        If this is set to a non zero number or true (identical to -1 or an\r
        unlimited number), the submodule summary will be enabled and a\r
        summary of commits for modified submodules will be shown (see\r
        --summary-limit option of <xref linkend="git-submodule(1)" />).\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
submodule.&lt;name&gt;.path\r
</term>\r
<term>\r
submodule.&lt;name&gt;.url\r
</term>\r
<term>\r
submodule.&lt;name&gt;.update\r
</term>\r
<listitem>\r
<simpara>\r
        The path within this project, URL, and the updating strategy\r
        for a submodule.  These variables are initially populated\r
        by <emphasis>git submodule init</emphasis>; edit them to override the\r
        URL and other values found in the <emphasis>.gitmodules</emphasis> file.  See\r
        <xref linkend="git-submodule(1)" /> and <xref linkend="gitmodules(5)" /> for details.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
submodule.&lt;name&gt;.fetchRecurseSubmodules\r
</term>\r
<listitem>\r
<simpara>\r
        This option can be used to control recursive fetching of this\r
        submodule. It can be overridden by using the --[no-]recurse-submodules\r
        command line option to "git fetch" and "git pull".\r
        This setting will override that from in the <xref linkend="gitmodules(5)" />\r
        file.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
submodule.&lt;name&gt;.ignore\r
</term>\r
<listitem>\r
<simpara>\r
        Defines under what circumstances "git status" and the diff family show\r
        a submodule as modified. When set to "all", it will never be considered\r
        modified, "dirty" will ignore all changes to the submodules work tree and\r
        takes only differences between the HEAD of the submodule and the commit\r
        recorded in the superproject into account. "untracked" will additionally\r
        let submodules with modified tracked files in their work tree show up.\r
        Using "none" (the default when this option is not set) also shows\r
        submodules that have untracked files in their work tree as changed.\r
        This setting overrides any setting made in .gitmodules for this submodule,\r
        both settings can be overridden on the command line by using the\r
        "--ignore-submodules" option.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
tar.umask\r
</term>\r
<listitem>\r
<simpara>\r
        This variable can be used to restrict the permission bits of\r
        tar archive entries.  The default is 0002, which turns off the\r
        world write bit.  The special value "user" indicates that the\r
        archiving user's umask will be used instead.  See umask(2) and\r
        <xref linkend="git-archive(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
transfer.fsckObjects\r
</term>\r
<listitem>\r
<simpara>\r
        When <emphasis>fetch.fsckObjects</emphasis> or <emphasis>receive.fsckObjects</emphasis> are\r
        not set, the value of this variable is used instead.\r
        Defaults to false.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
transfer.unpackLimit\r
</term>\r
<listitem>\r
<simpara>\r
        When <emphasis>fetch.unpackLimit</emphasis> or <emphasis>receive.unpackLimit</emphasis> are\r
        not set, the value of this variable is used instead.\r
        The default value is 100.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
url.&lt;base&gt;.insteadOf\r
</term>\r
<listitem>\r
<simpara>\r
        Any URL that starts with this value will be rewritten to\r
        start, instead, with &lt;base&gt;. In cases where some site serves a\r
        large number of repositories, and serves them with multiple\r
        access methods, and some users need to use different access\r
        methods, this feature allows people to specify any of the\r
        equivalent URLs and have git automatically rewrite the URL to\r
        the best alternative for the particular user, even for a\r
        never-before-seen repository on the site.  When more than one\r
        insteadOf strings match a given URL, the longest match is used.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
url.&lt;base&gt;.pushInsteadOf\r
</term>\r
<listitem>\r
<simpara>\r
        Any URL that starts with this value will not be pushed to;\r
        instead, it will be rewritten to start with &lt;base&gt;, and the\r
        resulting URL will be pushed to. In cases where some site serves\r
        a large number of repositories, and serves them with multiple\r
        access methods, some of which do not allow push, this feature\r
        allows people to specify a pull-only URL and have git\r
        automatically use an appropriate URL to push, even for a\r
        never-before-seen repository on the site.  When more than one\r
        pushInsteadOf strings match a given URL, the longest match is\r
        used.  If a remote has an explicit pushurl, git will ignore this\r
        setting for that remote.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
user.email\r
</term>\r
<listitem>\r
<simpara>\r
        Your email address to be recorded in any newly created commits.\r
        Can be overridden by the <emphasis>GIT_AUTHOR_EMAIL</emphasis>, <emphasis>GIT_COMMITTER_EMAIL</emphasis>, and\r
        <emphasis>EMAIL</emphasis> environment variables.  See <xref linkend="git-commit-tree(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
user.name\r
</term>\r
<listitem>\r
<simpara>\r
        Your full name to be recorded in any newly created commits.\r
        Can be overridden by the <emphasis>GIT_AUTHOR_NAME</emphasis> and <emphasis>GIT_COMMITTER_NAME</emphasis>\r
        environment variables.  See <xref linkend="git-commit-tree(1)" />.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
user.signingkey\r
</term>\r
<listitem>\r
<simpara>\r
        If <xref linkend="git-tag(1)" /> is not selecting the key you want it to\r
        automatically when creating a signed tag, you can override the\r
        default selection with this variable.  This option is passed\r
        unchanged to gpg's --local-user parameter, so you may specify a key\r
        using any method that gpg supports.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
<varlistentry>\r
<term>\r
web.browser\r
</term>\r
<listitem>\r
<simpara>\r
        Specify a web browser that may be used by some commands.\r
        Currently only <xref linkend="git-instaweb(1)" /> and <xref linkend="git-help(1)" />\r
        may use it.\r
</simpara>\r
</listitem>\r
</varlistentry>\r
</variablelist>\r
</section>\r
</simplesect>\r
<simplesect id="git-config(1)__git">\r
<title>GIT</title>\r
<simpara>Part of the <xref linkend="git(1)" /> suite</simpara>\r
</simplesect>\r
</sect2>\r