2006-04-24 22:59:33 +00:00
|
|
|
CONFIGURATION FILE
|
|
|
|
------------------
|
|
|
|
|
|
|
|
The git configuration file contains a number of variables that affect
|
2009-04-23 09:38:00 +00:00
|
|
|
the git command's behavior. The `.git/config` file in each repository
|
2009-04-23 09:38:02 +00:00
|
|
|
is used to store the configuration for that repository, and
|
|
|
|
`$HOME/.gitconfig` is used to store a per-user configuration as
|
2009-04-23 09:38:00 +00:00
|
|
|
fallback values for the `.git/config` file. The file `/etc/gitconfig`
|
2009-04-23 09:38:02 +00:00
|
|
|
can be used to store a system-wide default configuration.
|
2007-01-17 06:45:35 +00:00
|
|
|
|
2009-04-23 09:38:01 +00:00
|
|
|
The configuration variables are used by both the git plumbing
|
|
|
|
and the porcelains. The variables are divided into sections, wherein
|
|
|
|
the fully qualified variable name of the variable itself is the last
|
2006-04-24 22:59:33 +00:00
|
|
|
dot-separated segment and the section name is everything before the last
|
|
|
|
dot. The variable names are case-insensitive and only alphanumeric
|
|
|
|
characters are allowed. Some variables may appear multiple times.
|
|
|
|
|
2007-01-22 15:25:47 +00:00
|
|
|
Syntax
|
|
|
|
~~~~~~
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
The syntax is fairly flexible and permissive; whitespaces are mostly
|
2007-01-22 15:25:47 +00:00
|
|
|
ignored. The '#' and ';' characters begin comments to the end of line,
|
|
|
|
blank lines are ignored.
|
|
|
|
|
|
|
|
The file consists of sections and variables. A section begins with
|
|
|
|
the name of the section in square brackets and continues until the next
|
|
|
|
section begins. Section names are not case sensitive. Only alphanumeric
|
2009-03-15 11:30:52 +00:00
|
|
|
characters, `-` and `.` are allowed in section names. Each variable
|
2009-04-23 09:38:00 +00:00
|
|
|
must belong to some section, which means that there must be a section
|
|
|
|
header before the first setting of a variable.
|
2007-01-22 15:25:47 +00:00
|
|
|
|
|
|
|
Sections can be further divided into subsections. To begin a subsection
|
|
|
|
put its name in double quotes, separated by space from the section name,
|
2009-04-23 09:38:00 +00:00
|
|
|
in the section header, like in the example below:
|
2007-01-22 15:25:47 +00:00
|
|
|
|
|
|
|
--------
|
|
|
|
[section "subsection"]
|
|
|
|
|
|
|
|
--------
|
|
|
|
|
2009-04-23 09:38:01 +00:00
|
|
|
Subsection names are case sensitive and can contain any characters except
|
|
|
|
newline (doublequote `"` and backslash have to be escaped as `\"` and `\\`,
|
|
|
|
respectively). Section headers cannot span multiple
|
2007-01-22 15:25:47 +00:00
|
|
|
lines. Variables may belong directly to a section or to a given subsection.
|
|
|
|
You can have `[section]` if you have `[section "subsection"]`, but you
|
|
|
|
don't need to.
|
|
|
|
|
2009-04-23 09:38:00 +00:00
|
|
|
There is also a case insensitive alternative `[section.subsection]` syntax.
|
|
|
|
In this syntax, subsection names follow the same restrictions as for section
|
|
|
|
names.
|
2007-01-22 15:25:47 +00:00
|
|
|
|
2009-07-25 00:28:50 +00:00
|
|
|
All the other lines (and the remainder of the line after the section
|
|
|
|
header) are recognized as setting variables, in the form
|
2007-01-22 15:25:47 +00:00
|
|
|
'name = value'. If there is no equal sign on the line, the entire line
|
|
|
|
is taken as 'name' and the variable is recognized as boolean "true".
|
|
|
|
The variable names are case-insensitive and only alphanumeric
|
2009-03-15 11:30:52 +00:00
|
|
|
characters and `-` are allowed. There can be more than one value
|
2007-01-22 15:25:47 +00:00
|
|
|
for a given variable; we say then that variable is multivalued.
|
|
|
|
|
|
|
|
Leading and trailing whitespace in a variable value is discarded.
|
|
|
|
Internal whitespace within a variable value is retained verbatim.
|
|
|
|
|
|
|
|
The values following the equals sign in variable assign are all either
|
|
|
|
a string, an integer, or a boolean. Boolean values may be given as yes/no,
|
2009-04-17 20:34:25 +00:00
|
|
|
0/1, true/false or on/off. Case is not significant in boolean values, when
|
2007-01-22 15:25:47 +00:00
|
|
|
converting value to the canonical form using '--bool' type specifier;
|
2010-01-09 23:33:00 +00:00
|
|
|
'git config' will ensure that the output is "true" or "false".
|
2007-01-22 15:25:47 +00:00
|
|
|
|
|
|
|
String values may be entirely or partially enclosed in double quotes.
|
2009-04-23 09:38:00 +00:00
|
|
|
You need to enclose variable values in double quotes if you want to
|
|
|
|
preserve leading or trailing whitespace, or if the variable value contains
|
|
|
|
comment characters (i.e. it contains '#' or ';').
|
|
|
|
Double quote `"` and backslash `\` characters in variable values must
|
2009-03-15 11:30:52 +00:00
|
|
|
be escaped: use `\"` for `"` and `\\` for `\`.
|
2007-01-22 15:25:47 +00:00
|
|
|
|
2009-03-15 11:30:52 +00:00
|
|
|
The following escape sequences (beside `\"` and `\\`) are recognized:
|
|
|
|
`\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB)
|
|
|
|
and `\b` for backspace (BS). No other char escape sequence, nor octal
|
2007-01-22 15:25:47 +00:00
|
|
|
char sequences are valid.
|
|
|
|
|
2009-04-23 09:38:00 +00:00
|
|
|
Variable values ending in a `\` are continued on the next line in the
|
2007-01-22 15:25:47 +00:00
|
|
|
customary UNIX fashion.
|
|
|
|
|
2009-04-23 09:38:00 +00:00
|
|
|
Some variables may require a special value format.
|
2006-04-24 22:59:33 +00:00
|
|
|
|
|
|
|
Example
|
|
|
|
~~~~~~~
|
|
|
|
|
|
|
|
# Core variables
|
|
|
|
[core]
|
|
|
|
; Don't trust file modes
|
|
|
|
filemode = false
|
|
|
|
|
|
|
|
# Our diff algorithm
|
|
|
|
[diff]
|
2008-07-27 11:12:15 +00:00
|
|
|
external = /usr/local/bin/diff-wrapper
|
2006-04-24 22:59:33 +00:00
|
|
|
renames = true
|
|
|
|
|
2006-12-07 06:36:55 +00:00
|
|
|
[branch "devel"]
|
|
|
|
remote = origin
|
|
|
|
merge = refs/heads/devel
|
|
|
|
|
2007-01-22 15:25:47 +00:00
|
|
|
# Proxy settings
|
|
|
|
[core]
|
2007-08-02 22:45:56 +00:00
|
|
|
gitProxy="ssh" for "kernel.org"
|
2007-01-22 15:25:47 +00:00
|
|
|
gitProxy=default-proxy ; for the rest
|
2006-12-07 06:36:55 +00:00
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
Variables
|
|
|
|
~~~~~~~~~
|
|
|
|
|
|
|
|
Note that this list is non-comprehensive and not necessarily complete.
|
2006-06-07 23:15:05 +00:00
|
|
|
For command-specific variables, you will find a more detailed description
|
|
|
|
in the appropriate manual page. You will find a description of non-core
|
2006-04-24 22:59:33 +00:00
|
|
|
porcelain configuration variables in the respective porcelain documentation.
|
|
|
|
|
2009-09-09 11:38:58 +00:00
|
|
|
advice.*::
|
|
|
|
When set to 'true', display the given optional help message.
|
|
|
|
When set to 'false', do not display. The configuration variables
|
|
|
|
are:
|
|
|
|
+
|
|
|
|
--
|
|
|
|
pushNonFastForward::
|
|
|
|
Advice shown when linkgit:git-push[1] refuses
|
|
|
|
non-fast-forward refs. Default: true.
|
2009-09-09 11:43:03 +00:00
|
|
|
statusHints::
|
|
|
|
Directions on how to stage/unstage/add shown in the
|
|
|
|
output of linkgit:git-status[1] and the template shown
|
|
|
|
when writing commit messages. Default: true.
|
2009-11-22 22:26:17 +00:00
|
|
|
commitBeforeMerge::
|
|
|
|
Advice shown when linkgit:git-merge[1] refuses to
|
|
|
|
merge to avoid overwritting local changes.
|
|
|
|
Default: true.
|
Be more user-friendly when refusing to do something because of conflict.
Various commands refuse to run in the presence of conflicts (commit,
merge, pull, cherry-pick/revert). They all used to provide rough, and
inconsistant error messages.
A new variable advice.resolveconflict is introduced, and allows more
verbose messages, pointing the user to the appropriate solution.
For commit, the error message used to look like this:
$ git commit
foo.txt: needs merge
foo.txt: unmerged (c34a92682e0394bc0d6f4d4a67a8e2d32395c169)
foo.txt: unmerged (3afcd75de8de0bb5076942fcb17446be50451030)
foo.txt: unmerged (c9785d77b76dfe4fb038bf927ee518f6ae45ede4)
error: Error building trees
The "need merge" line is given by refresh_cache. We add the IN_PORCELAIN
option to make the output more consistant with the other porcelain
commands, and catch the error in return, to stop with a clean error
message. The next lines were displayed by a call to cache_tree_update(),
which is not reached anymore if we noticed the conflict.
The new output looks like:
U foo.txt
fatal: 'commit' is not possible because you have unmerged files.
Please, fix them up in the work tree, and then use 'git add/rm <file>' as
appropriate to mark resolution and make a commit, or use 'git commit -a'.
Pull is slightly modified to abort immediately if $GIT_DIR/MERGE_HEAD
exists instead of waiting for merge to complain.
The behavior of merge and the test-case are slightly modified to reflect
the usual flow: start with conflicts, fix them, and afterwards get rid of
MERGE_HEAD, with different error messages at each stage.
Signed-off-by: Matthieu Moy <Matthieu.Moy@imag.fr>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-01-12 09:54:44 +00:00
|
|
|
resolveConflict::
|
|
|
|
Advices shown by various commands when conflicts
|
|
|
|
prevent the operation from being performed.
|
|
|
|
Default: true.
|
2010-01-13 20:17:08 +00:00
|
|
|
implicitIdentity::
|
|
|
|
Advice on how to set your identity configuration when
|
|
|
|
your information is guessed from the system username and
|
|
|
|
domain name. Default: true.
|
2010-01-30 06:03:24 +00:00
|
|
|
|
|
|
|
detachedHead::
|
|
|
|
Advice shown when you used linkgit::git-checkout[1] to
|
|
|
|
move to the detach HEAD state, to instruct how to create
|
|
|
|
a local branch after the fact. Default: true.
|
2009-09-09 11:38:58 +00:00
|
|
|
--
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
core.fileMode::
|
|
|
|
If false, the executable bit differences between the index and
|
|
|
|
the working copy are ignored; useful on broken filesystems like FAT.
|
2009-11-23 02:07:30 +00:00
|
|
|
See linkgit:git-update-index[1].
|
|
|
|
+
|
|
|
|
The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
|
|
|
|
will probe and set core.fileMode false if appropriate when the
|
|
|
|
repository is created.
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2008-09-30 13:53:47 +00:00
|
|
|
core.ignoreCygwinFSTricks::
|
|
|
|
This option is only used by Cygwin implementation of Git. If false,
|
|
|
|
the Cygwin stat() and lstat() functions are used. This may be useful
|
|
|
|
if your repository consists of a few separate directories joined in
|
|
|
|
one hierarchy using Cygwin mount. If true, Git uses native Win32 API
|
|
|
|
whenever it is possible and falls back to Cygwin functions only to
|
|
|
|
handle symbol links. The native mode is more than twice faster than
|
2008-10-13 04:33:31 +00:00
|
|
|
normal Cygwin l/stat() functions. True by default, unless core.filemode
|
|
|
|
is true, in which case ignoreCygwinFSTricks is ignored as Cygwin's
|
|
|
|
POSIX emulation is required to support core.filemode.
|
2008-09-30 13:53:47 +00:00
|
|
|
|
2009-11-23 02:07:30 +00:00
|
|
|
core.ignorecase::
|
|
|
|
If true, this option enables various workarounds to enable
|
|
|
|
git to work better on filesystems that are not case sensitive,
|
|
|
|
like FAT. For example, if a directory listing finds
|
|
|
|
"makefile" when git expects "Makefile", git will assume
|
|
|
|
it is really the same file, and continue to remember it as
|
|
|
|
"Makefile".
|
|
|
|
+
|
|
|
|
The default is false, except linkgit:git-clone[1] or linkgit:git-init[1]
|
|
|
|
will probe and set core.ignorecase true if appropriate when the repository
|
|
|
|
is created.
|
|
|
|
|
2008-07-28 06:31:28 +00:00
|
|
|
core.trustctime::
|
|
|
|
If false, the ctime differences between the index and the
|
|
|
|
working copy are ignored; useful when the inode change time
|
|
|
|
is regularly modified by something outside Git (file system
|
|
|
|
crawlers and some backup systems).
|
|
|
|
See linkgit:git-update-index[1]. True by default.
|
|
|
|
|
2007-06-24 22:11:24 +00:00
|
|
|
core.quotepath::
|
2008-07-03 05:59:09 +00:00
|
|
|
The commands that output paths (e.g. 'ls-files',
|
|
|
|
'diff'), when not given the `-z` option, will quote
|
2007-06-24 22:11:24 +00:00
|
|
|
"unusual" characters in the pathname by enclosing the
|
|
|
|
pathname in a double-quote pair and with backslashes the
|
|
|
|
same way strings in C source code are quoted. If this
|
|
|
|
variable is set to false, the bytes higher than 0x80 are
|
|
|
|
not quoted but output as verbatim. Note that double
|
|
|
|
quote, backslash and control characters are always
|
|
|
|
quoted without `-z` regardless of the setting of this
|
|
|
|
variable.
|
|
|
|
|
2010-06-04 19:29:08 +00:00
|
|
|
core.eol::
|
|
|
|
Sets the line ending type to use in the working directory for
|
|
|
|
files that have the `text` property set. Alternatives are
|
|
|
|
'lf', 'crlf' and 'native', which uses the platform's native
|
|
|
|
line ending. The default value is `native`. See
|
|
|
|
linkgit:gitattributes[5] for more information on end-of-line
|
|
|
|
conversion.
|
2007-04-13 16:02:31 +00:00
|
|
|
|
safecrlf: Add mechanism to warn about irreversible crlf conversions
CRLF conversion bears a slight chance of corrupting data.
autocrlf=true will convert CRLF to LF during commit and LF to
CRLF during checkout. A file that contains a mixture of LF and
CRLF before the commit cannot be recreated by git. For text
files this is the right thing to do: it corrects line endings
such that we have only LF line endings in the repository.
But for binary files that are accidentally classified as text the
conversion can corrupt data.
If you recognize such corruption early you can easily fix it by
setting the conversion type explicitly in .gitattributes. Right
after committing you still have the original file in your work
tree and this file is not yet corrupted. You can explicitly tell
git that this file is binary and git will handle the file
appropriately.
Unfortunately, the desired effect of cleaning up text files with
mixed line endings and the undesired effect of corrupting binary
files cannot be distinguished. In both cases CRLFs are removed
in an irreversible way. For text files this is the right thing
to do because CRLFs are line endings, while for binary files
converting CRLFs corrupts data.
This patch adds a mechanism that can either warn the user about
an irreversible conversion or can even refuse to convert. The
mechanism is controlled by the variable core.safecrlf, with the
following values:
- false: disable safecrlf mechanism
- warn: warn about irreversible conversions
- true: refuse irreversible conversions
The default is to warn. Users are only affected by this default
if core.autocrlf is set. But the current default of git is to
leave core.autocrlf unset, so users will not see warnings unless
they deliberately chose to activate the autocrlf mechanism.
The safecrlf mechanism's details depend on the git command. The
general principles when safecrlf is active (not false) are:
- we warn/error out if files in the work tree can modified in an
irreversible way without giving the user a chance to backup the
original file.
- for read-only operations that do not modify files in the work tree
we do not not print annoying warnings.
There are exceptions. Even though...
- "git add" itself does not touch the files in the work tree, the
next checkout would, so the safety triggers;
- "git apply" to update a text file with a patch does touch the files
in the work tree, but the operation is about text files and CRLF
conversion is about fixing the line ending inconsistencies, so the
safety does not trigger;
- "git diff" itself does not touch the files in the work tree, it is
often run to inspect the changes you intend to next "git add". To
catch potential problems early, safety triggers.
The concept of a safety check was originally proposed in a similar
way by Linus Torvalds. Thanks to Dimitry Potapov for insisting
on getting the naked LF/autocrlf=true case right.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
2008-02-06 11:25:58 +00:00
|
|
|
core.safecrlf::
|
2010-05-19 20:43:10 +00:00
|
|
|
If true, makes git check if converting `CRLF` is reversible when
|
|
|
|
end-of-line conversion is active. Git will verify if a command
|
safecrlf: Add mechanism to warn about irreversible crlf conversions
CRLF conversion bears a slight chance of corrupting data.
autocrlf=true will convert CRLF to LF during commit and LF to
CRLF during checkout. A file that contains a mixture of LF and
CRLF before the commit cannot be recreated by git. For text
files this is the right thing to do: it corrects line endings
such that we have only LF line endings in the repository.
But for binary files that are accidentally classified as text the
conversion can corrupt data.
If you recognize such corruption early you can easily fix it by
setting the conversion type explicitly in .gitattributes. Right
after committing you still have the original file in your work
tree and this file is not yet corrupted. You can explicitly tell
git that this file is binary and git will handle the file
appropriately.
Unfortunately, the desired effect of cleaning up text files with
mixed line endings and the undesired effect of corrupting binary
files cannot be distinguished. In both cases CRLFs are removed
in an irreversible way. For text files this is the right thing
to do because CRLFs are line endings, while for binary files
converting CRLFs corrupts data.
This patch adds a mechanism that can either warn the user about
an irreversible conversion or can even refuse to convert. The
mechanism is controlled by the variable core.safecrlf, with the
following values:
- false: disable safecrlf mechanism
- warn: warn about irreversible conversions
- true: refuse irreversible conversions
The default is to warn. Users are only affected by this default
if core.autocrlf is set. But the current default of git is to
leave core.autocrlf unset, so users will not see warnings unless
they deliberately chose to activate the autocrlf mechanism.
The safecrlf mechanism's details depend on the git command. The
general principles when safecrlf is active (not false) are:
- we warn/error out if files in the work tree can modified in an
irreversible way without giving the user a chance to backup the
original file.
- for read-only operations that do not modify files in the work tree
we do not not print annoying warnings.
There are exceptions. Even though...
- "git add" itself does not touch the files in the work tree, the
next checkout would, so the safety triggers;
- "git apply" to update a text file with a patch does touch the files
in the work tree, but the operation is about text files and CRLF
conversion is about fixing the line ending inconsistencies, so the
safety does not trigger;
- "git diff" itself does not touch the files in the work tree, it is
often run to inspect the changes you intend to next "git add". To
catch potential problems early, safety triggers.
The concept of a safety check was originally proposed in a similar
way by Linus Torvalds. Thanks to Dimitry Potapov for insisting
on getting the naked LF/autocrlf=true case right.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
2008-02-06 11:25:58 +00:00
|
|
|
modifies a file in the work tree either directly or indirectly.
|
|
|
|
For example, committing a file followed by checking out the
|
|
|
|
same file should yield the original file in the work tree. If
|
|
|
|
this is not the case for the current setting of
|
|
|
|
`core.autocrlf`, git will reject the file. The variable can
|
|
|
|
be set to "warn", in which case git will only warn about an
|
|
|
|
irreversible conversion but continue the operation.
|
|
|
|
+
|
|
|
|
CRLF conversion bears a slight chance of corrupting data.
|
2010-06-04 19:29:08 +00:00
|
|
|
When it is enabled, git will convert CRLF to LF during commit and LF to
|
safecrlf: Add mechanism to warn about irreversible crlf conversions
CRLF conversion bears a slight chance of corrupting data.
autocrlf=true will convert CRLF to LF during commit and LF to
CRLF during checkout. A file that contains a mixture of LF and
CRLF before the commit cannot be recreated by git. For text
files this is the right thing to do: it corrects line endings
such that we have only LF line endings in the repository.
But for binary files that are accidentally classified as text the
conversion can corrupt data.
If you recognize such corruption early you can easily fix it by
setting the conversion type explicitly in .gitattributes. Right
after committing you still have the original file in your work
tree and this file is not yet corrupted. You can explicitly tell
git that this file is binary and git will handle the file
appropriately.
Unfortunately, the desired effect of cleaning up text files with
mixed line endings and the undesired effect of corrupting binary
files cannot be distinguished. In both cases CRLFs are removed
in an irreversible way. For text files this is the right thing
to do because CRLFs are line endings, while for binary files
converting CRLFs corrupts data.
This patch adds a mechanism that can either warn the user about
an irreversible conversion or can even refuse to convert. The
mechanism is controlled by the variable core.safecrlf, with the
following values:
- false: disable safecrlf mechanism
- warn: warn about irreversible conversions
- true: refuse irreversible conversions
The default is to warn. Users are only affected by this default
if core.autocrlf is set. But the current default of git is to
leave core.autocrlf unset, so users will not see warnings unless
they deliberately chose to activate the autocrlf mechanism.
The safecrlf mechanism's details depend on the git command. The
general principles when safecrlf is active (not false) are:
- we warn/error out if files in the work tree can modified in an
irreversible way without giving the user a chance to backup the
original file.
- for read-only operations that do not modify files in the work tree
we do not not print annoying warnings.
There are exceptions. Even though...
- "git add" itself does not touch the files in the work tree, the
next checkout would, so the safety triggers;
- "git apply" to update a text file with a patch does touch the files
in the work tree, but the operation is about text files and CRLF
conversion is about fixing the line ending inconsistencies, so the
safety does not trigger;
- "git diff" itself does not touch the files in the work tree, it is
often run to inspect the changes you intend to next "git add". To
catch potential problems early, safety triggers.
The concept of a safety check was originally proposed in a similar
way by Linus Torvalds. Thanks to Dimitry Potapov for insisting
on getting the naked LF/autocrlf=true case right.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
2008-02-06 11:25:58 +00:00
|
|
|
CRLF during checkout. A file that contains a mixture of LF and
|
|
|
|
CRLF before the commit cannot be recreated by git. For text
|
|
|
|
files this is the right thing to do: it corrects line endings
|
|
|
|
such that we have only LF line endings in the repository.
|
|
|
|
But for binary files that are accidentally classified as text the
|
|
|
|
conversion can corrupt data.
|
|
|
|
+
|
|
|
|
If you recognize such corruption early you can easily fix it by
|
|
|
|
setting the conversion type explicitly in .gitattributes. Right
|
|
|
|
after committing you still have the original file in your work
|
|
|
|
tree and this file is not yet corrupted. You can explicitly tell
|
|
|
|
git that this file is binary and git will handle the file
|
|
|
|
appropriately.
|
|
|
|
+
|
|
|
|
Unfortunately, the desired effect of cleaning up text files with
|
|
|
|
mixed line endings and the undesired effect of corrupting binary
|
|
|
|
files cannot be distinguished. In both cases CRLFs are removed
|
|
|
|
in an irreversible way. For text files this is the right thing
|
|
|
|
to do because CRLFs are line endings, while for binary files
|
|
|
|
converting CRLFs corrupts data.
|
|
|
|
+
|
|
|
|
Note, this safety check does not mean that a checkout will generate a
|
|
|
|
file identical to the original file for a different setting of
|
2010-06-04 19:29:08 +00:00
|
|
|
`core.eol` and `core.autocrlf`, but only for the current one. For
|
|
|
|
example, a text file with `LF` would be accepted with `core.eol=lf`
|
|
|
|
and could later be checked out with `core.eol=crlf`, in which case the
|
safecrlf: Add mechanism to warn about irreversible crlf conversions
CRLF conversion bears a slight chance of corrupting data.
autocrlf=true will convert CRLF to LF during commit and LF to
CRLF during checkout. A file that contains a mixture of LF and
CRLF before the commit cannot be recreated by git. For text
files this is the right thing to do: it corrects line endings
such that we have only LF line endings in the repository.
But for binary files that are accidentally classified as text the
conversion can corrupt data.
If you recognize such corruption early you can easily fix it by
setting the conversion type explicitly in .gitattributes. Right
after committing you still have the original file in your work
tree and this file is not yet corrupted. You can explicitly tell
git that this file is binary and git will handle the file
appropriately.
Unfortunately, the desired effect of cleaning up text files with
mixed line endings and the undesired effect of corrupting binary
files cannot be distinguished. In both cases CRLFs are removed
in an irreversible way. For text files this is the right thing
to do because CRLFs are line endings, while for binary files
converting CRLFs corrupts data.
This patch adds a mechanism that can either warn the user about
an irreversible conversion or can even refuse to convert. The
mechanism is controlled by the variable core.safecrlf, with the
following values:
- false: disable safecrlf mechanism
- warn: warn about irreversible conversions
- true: refuse irreversible conversions
The default is to warn. Users are only affected by this default
if core.autocrlf is set. But the current default of git is to
leave core.autocrlf unset, so users will not see warnings unless
they deliberately chose to activate the autocrlf mechanism.
The safecrlf mechanism's details depend on the git command. The
general principles when safecrlf is active (not false) are:
- we warn/error out if files in the work tree can modified in an
irreversible way without giving the user a chance to backup the
original file.
- for read-only operations that do not modify files in the work tree
we do not not print annoying warnings.
There are exceptions. Even though...
- "git add" itself does not touch the files in the work tree, the
next checkout would, so the safety triggers;
- "git apply" to update a text file with a patch does touch the files
in the work tree, but the operation is about text files and CRLF
conversion is about fixing the line ending inconsistencies, so the
safety does not trigger;
- "git diff" itself does not touch the files in the work tree, it is
often run to inspect the changes you intend to next "git add". To
catch potential problems early, safety triggers.
The concept of a safety check was originally proposed in a similar
way by Linus Torvalds. Thanks to Dimitry Potapov for insisting
on getting the naked LF/autocrlf=true case right.
Signed-off-by: Steffen Prohaska <prohaska@zib.de>
2008-02-06 11:25:58 +00:00
|
|
|
resulting file would contain `CRLF`, although the original file
|
|
|
|
contained `LF`. However, in both work trees the line endings would be
|
|
|
|
consistent, that is either all `LF` or all `CRLF`, but never mixed. A
|
|
|
|
file with mixed line endings would be reported by the `core.safecrlf`
|
|
|
|
mechanism.
|
|
|
|
|
2010-06-04 19:29:08 +00:00
|
|
|
core.autocrlf::
|
|
|
|
Setting this variable to "true" is almost the same as setting
|
|
|
|
the `text` attribute to "auto" on all files except that text
|
|
|
|
files are not guaranteed to be normalized: files that contain
|
|
|
|
`CRLF` in the repository will not be touched. Use this
|
|
|
|
setting if you want to have `CRLF` line endings in your
|
|
|
|
working directory even though the repository does not have
|
|
|
|
normalized line endings. This variable can be set to 'input',
|
|
|
|
in which case no output conversion is performed.
|
|
|
|
|
2007-03-02 21:11:30 +00:00
|
|
|
core.symlinks::
|
|
|
|
If false, symbolic links are checked out as small plain files that
|
2007-12-29 06:20:38 +00:00
|
|
|
contain the link text. linkgit:git-update-index[1] and
|
|
|
|
linkgit:git-add[1] will not change the recorded type to regular
|
2007-03-02 21:11:30 +00:00
|
|
|
file. Useful on filesystems like FAT that do not support
|
2009-11-23 02:07:30 +00:00
|
|
|
symbolic links.
|
|
|
|
+
|
|
|
|
The default is true, except linkgit:git-clone[1] or linkgit:git-init[1]
|
|
|
|
will probe and set core.symlinks false if appropriate when the repository
|
|
|
|
is created.
|
2007-03-02 21:11:30 +00:00
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
core.gitProxy::
|
|
|
|
A "proxy command" to execute (as 'command host port') instead
|
|
|
|
of establishing direct connection to the remote server when
|
|
|
|
using the git protocol for fetching. If the variable value is
|
|
|
|
in the "COMMAND for DOMAIN" format, the command is applied only
|
|
|
|
on hostnames ending with the specified domain string. This variable
|
|
|
|
may be set multiple times and is matched in the given order;
|
|
|
|
the first match wins.
|
2006-06-07 23:15:05 +00:00
|
|
|
+
|
|
|
|
Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
|
|
|
|
(which always applies universally, without the special "for"
|
|
|
|
handling).
|
2009-03-17 17:31:42 +00:00
|
|
|
+
|
|
|
|
The special string `none` can be used as the proxy command to
|
|
|
|
specify that no proxy be used for a given domain pattern.
|
|
|
|
This is useful for excluding servers inside a firewall from
|
|
|
|
proxy use, while defaulting to a common proxy for external domains.
|
2006-04-24 22:59:33 +00:00
|
|
|
|
|
|
|
core.ignoreStat::
|
2008-05-30 11:14:24 +00:00
|
|
|
If true, commands which modify both the working tree and the index
|
|
|
|
will mark the updated paths with the "assume unchanged" bit in the
|
|
|
|
index. These marked files are then assumed to stay unchanged in the
|
|
|
|
working copy, until you mark them otherwise manually - Git will not
|
|
|
|
detect the file changes by lstat() calls. This is useful on systems
|
|
|
|
where those are very slow, such as Microsoft Windows.
|
|
|
|
See linkgit:git-update-index[1].
|
2006-04-24 22:59:33 +00:00
|
|
|
False by default.
|
|
|
|
|
2006-05-02 07:40:24 +00:00
|
|
|
core.preferSymlinkRefs::
|
|
|
|
Instead of the default "symref" format for HEAD
|
|
|
|
and other symbolic reference files, use symbolic links.
|
|
|
|
This is sometimes needed to work with old scripts that
|
|
|
|
expect HEAD to be a symbolic link.
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2007-02-21 22:59:08 +00:00
|
|
|
core.bare::
|
|
|
|
If true this repository is assumed to be 'bare' and has no
|
|
|
|
working directory associated with it. If this is the case a
|
|
|
|
number of commands that require a working directory will be
|
2007-12-29 06:20:38 +00:00
|
|
|
disabled, such as linkgit:git-add[1] or linkgit:git-merge[1].
|
2007-02-21 22:59:08 +00:00
|
|
|
+
|
2007-12-29 06:20:38 +00:00
|
|
|
This setting is automatically guessed by linkgit:git-clone[1] or
|
|
|
|
linkgit:git-init[1] when the repository was created. By default a
|
2007-02-21 22:59:08 +00:00
|
|
|
repository that ends in "/.git" is assumed to be not bare (bare =
|
|
|
|
false), while all other repositories are assumed to be bare (bare
|
|
|
|
= true).
|
|
|
|
|
2007-06-06 07:10:42 +00:00
|
|
|
core.worktree::
|
2009-12-29 07:48:41 +00:00
|
|
|
Set the path to the root of the work tree.
|
2007-10-09 21:00:03 +00:00
|
|
|
This can be overridden by the GIT_WORK_TREE environment
|
2008-04-28 20:09:20 +00:00
|
|
|
variable and the '--work-tree' command line option. It can be
|
2009-12-29 07:48:41 +00:00
|
|
|
an absolute path or a relative path to the .git directory,
|
|
|
|
either specified by --git-dir or GIT_DIR, or automatically
|
|
|
|
discovered.
|
|
|
|
If --git-dir or GIT_DIR are specified but none of
|
2008-04-28 20:09:20 +00:00
|
|
|
--work-tree, GIT_WORK_TREE and core.worktree is specified,
|
2009-12-29 07:48:41 +00:00
|
|
|
the current working directory is regarded as the root of the
|
|
|
|
work tree.
|
|
|
|
+
|
|
|
|
Note that this variable is honored even when set in a configuration
|
|
|
|
file in a ".git" subdirectory of a directory, and its value differs
|
|
|
|
from the latter directory (e.g. "/path/to/.git/config" has
|
|
|
|
core.worktree set to "/different/path"), which is most likely a
|
|
|
|
misconfiguration. Running git commands in "/path/to" directory will
|
|
|
|
still use "/different/path" as the root of the work tree and can cause
|
|
|
|
great confusion to the users.
|
2007-06-06 07:10:42 +00:00
|
|
|
|
2006-05-17 09:55:40 +00:00
|
|
|
core.logAllRefUpdates::
|
2007-08-19 21:38:57 +00:00
|
|
|
Enable the reflog. Updates to a ref <ref> is logged to the file
|
2006-10-08 08:35:18 +00:00
|
|
|
"$GIT_DIR/logs/<ref>", by appending the new and old
|
|
|
|
SHA1, the date/time and the reason of the update, but
|
|
|
|
only when the file exists. If this configuration
|
|
|
|
variable is set to true, missing "$GIT_DIR/logs/<ref>"
|
|
|
|
file is automatically created for branch heads.
|
2006-12-31 06:39:24 +00:00
|
|
|
+
|
|
|
|
This information can be used to determine what commit
|
|
|
|
was the tip of a branch "2 days ago".
|
|
|
|
+
|
|
|
|
This value is true by default in a repository that has
|
|
|
|
a working directory associated with it, and false by
|
|
|
|
default in a bare repository.
|
2006-05-17 09:55:40 +00:00
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
core.repositoryFormatVersion::
|
|
|
|
Internal variable identifying the repository format and layout
|
|
|
|
version.
|
|
|
|
|
|
|
|
core.sharedRepository::
|
2006-08-09 00:26:23 +00:00
|
|
|
When 'group' (or 'true'), the repository is made shareable between
|
|
|
|
several users in a group (making sure all the files and objects are
|
|
|
|
group-writable). When 'all' (or 'world' or 'everybody'), the
|
|
|
|
repository will be readable by all users, additionally to being
|
|
|
|
group-shareable. When 'umask' (or 'false'), git will use permissions
|
2008-04-16 08:34:24 +00:00
|
|
|
reported by umask(2). When '0xxx', where '0xxx' is an octal number,
|
|
|
|
files in the repository will have this mode value. '0xxx' will override
|
2009-04-14 13:15:42 +00:00
|
|
|
user's umask value (whereas the other options will only override
|
|
|
|
requested parts of the user's umask value). Examples: '0660' will make
|
|
|
|
the repo read/write-able for the owner and group, but inaccessible to
|
|
|
|
others (equivalent to 'group' unless umask is e.g. '0022'). '0640' is a
|
2008-04-16 08:34:24 +00:00
|
|
|
repository that is group-readable but not group-writable.
|
|
|
|
See linkgit:git-init[1]. False by default.
|
2006-04-24 22:59:33 +00:00
|
|
|
|
|
|
|
core.warnAmbiguousRefs::
|
|
|
|
If true, git will warn you if the ref name you passed it is ambiguous
|
|
|
|
and might match multiple refs in the .git/refs/ tree. True by default.
|
|
|
|
|
2006-07-06 20:35:54 +00:00
|
|
|
core.compression::
|
Custom compression levels for objects and packs
Add config variables pack.compression and core.loosecompression ,
and switch --compression=level to pack-objects.
Loose objects will be compressed using core.loosecompression if set,
else core.compression if set, else Z_BEST_SPEED.
Packed objects will be compressed using --compression=level if seen,
else pack.compression if set, else core.compression if set,
else Z_DEFAULT_COMPRESSION. This is the "pack compression level".
Loose objects added to a pack undeltified will be recompressed
to the pack compression level if it is unequal to the current
loose compression level by the preceding rules, or if the loose
object was written while core.legacyheaders = true. Newly
deltified loose objects are always compressed to the current
pack compression level.
Previously packed objects added to a pack are recompressed
to the current pack compression level exactly when their
deltification status changes, since the previous pack data
cannot be reused.
In either case, the --no-reuse-object switch from the first
patch below will always force recompression to the current pack
compression level, instead of assuming the pack compression level
hasn't changed and pack data can be reused when possible.
This applies on top of the following patches from Nicolas Pitre:
[PATCH] allow for undeltified objects not to be reused
[PATCH] make "repack -f" imply "pack-objects --no-reuse-object"
Signed-off-by: Dana L. How <danahow@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-09 20:56:50 +00:00
|
|
|
An integer -1..9, indicating a default compression level.
|
|
|
|
-1 is the zlib default. 0 means no compression,
|
|
|
|
and 1..9 are various speed/size tradeoffs, 9 being slowest.
|
2007-11-19 16:58:51 +00:00
|
|
|
If set, this provides a default to other compression variables,
|
|
|
|
such as 'core.loosecompression' and 'pack.compression'.
|
Custom compression levels for objects and packs
Add config variables pack.compression and core.loosecompression ,
and switch --compression=level to pack-objects.
Loose objects will be compressed using core.loosecompression if set,
else core.compression if set, else Z_BEST_SPEED.
Packed objects will be compressed using --compression=level if seen,
else pack.compression if set, else core.compression if set,
else Z_DEFAULT_COMPRESSION. This is the "pack compression level".
Loose objects added to a pack undeltified will be recompressed
to the pack compression level if it is unequal to the current
loose compression level by the preceding rules, or if the loose
object was written while core.legacyheaders = true. Newly
deltified loose objects are always compressed to the current
pack compression level.
Previously packed objects added to a pack are recompressed
to the current pack compression level exactly when their
deltification status changes, since the previous pack data
cannot be reused.
In either case, the --no-reuse-object switch from the first
patch below will always force recompression to the current pack
compression level, instead of assuming the pack compression level
hasn't changed and pack data can be reused when possible.
This applies on top of the following patches from Nicolas Pitre:
[PATCH] allow for undeltified objects not to be reused
[PATCH] make "repack -f" imply "pack-objects --no-reuse-object"
Signed-off-by: Dana L. How <danahow@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-09 20:56:50 +00:00
|
|
|
|
|
|
|
core.loosecompression::
|
2006-07-03 20:11:47 +00:00
|
|
|
An integer -1..9, indicating the compression level for objects that
|
Custom compression levels for objects and packs
Add config variables pack.compression and core.loosecompression ,
and switch --compression=level to pack-objects.
Loose objects will be compressed using core.loosecompression if set,
else core.compression if set, else Z_BEST_SPEED.
Packed objects will be compressed using --compression=level if seen,
else pack.compression if set, else core.compression if set,
else Z_DEFAULT_COMPRESSION. This is the "pack compression level".
Loose objects added to a pack undeltified will be recompressed
to the pack compression level if it is unequal to the current
loose compression level by the preceding rules, or if the loose
object was written while core.legacyheaders = true. Newly
deltified loose objects are always compressed to the current
pack compression level.
Previously packed objects added to a pack are recompressed
to the current pack compression level exactly when their
deltification status changes, since the previous pack data
cannot be reused.
In either case, the --no-reuse-object switch from the first
patch below will always force recompression to the current pack
compression level, instead of assuming the pack compression level
hasn't changed and pack data can be reused when possible.
This applies on top of the following patches from Nicolas Pitre:
[PATCH] allow for undeltified objects not to be reused
[PATCH] make "repack -f" imply "pack-objects --no-reuse-object"
Signed-off-by: Dana L. How <danahow@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-09 20:56:50 +00:00
|
|
|
are not in a pack file. -1 is the zlib default. 0 means no
|
2006-07-03 20:11:47 +00:00
|
|
|
compression, and 1..9 are various speed/size tradeoffs, 9 being
|
Custom compression levels for objects and packs
Add config variables pack.compression and core.loosecompression ,
and switch --compression=level to pack-objects.
Loose objects will be compressed using core.loosecompression if set,
else core.compression if set, else Z_BEST_SPEED.
Packed objects will be compressed using --compression=level if seen,
else pack.compression if set, else core.compression if set,
else Z_DEFAULT_COMPRESSION. This is the "pack compression level".
Loose objects added to a pack undeltified will be recompressed
to the pack compression level if it is unequal to the current
loose compression level by the preceding rules, or if the loose
object was written while core.legacyheaders = true. Newly
deltified loose objects are always compressed to the current
pack compression level.
Previously packed objects added to a pack are recompressed
to the current pack compression level exactly when their
deltification status changes, since the previous pack data
cannot be reused.
In either case, the --no-reuse-object switch from the first
patch below will always force recompression to the current pack
compression level, instead of assuming the pack compression level
hasn't changed and pack data can be reused when possible.
This applies on top of the following patches from Nicolas Pitre:
[PATCH] allow for undeltified objects not to be reused
[PATCH] make "repack -f" imply "pack-objects --no-reuse-object"
Signed-off-by: Dana L. How <danahow@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-09 20:56:50 +00:00
|
|
|
slowest. If not set, defaults to core.compression. If that is
|
2007-11-19 16:58:50 +00:00
|
|
|
not set, defaults to 1 (best speed).
|
2006-07-03 20:11:47 +00:00
|
|
|
|
2006-12-23 07:34:28 +00:00
|
|
|
core.packedGitWindowSize::
|
|
|
|
Number of bytes of a pack file to map into memory in a
|
|
|
|
single mapping operation. Larger window sizes may allow
|
|
|
|
your system to process a smaller number of large pack files
|
|
|
|
more quickly. Smaller window sizes will negatively affect
|
2006-12-31 03:13:43 +00:00
|
|
|
performance due to increased calls to the operating system's
|
2006-12-23 07:34:28 +00:00
|
|
|
memory manager, but may improve performance when accessing
|
2007-01-05 03:28:08 +00:00
|
|
|
a large number of large pack files.
|
|
|
|
+
|
|
|
|
Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32
|
|
|
|
MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should
|
|
|
|
be reasonable for all users/operating systems. You probably do
|
|
|
|
not need to adjust this value.
|
2006-12-31 03:13:43 +00:00
|
|
|
+
|
|
|
|
Common unit suffixes of 'k', 'm', or 'g' are supported.
|
2006-12-23 07:34:28 +00:00
|
|
|
|
2006-12-23 07:33:35 +00:00
|
|
|
core.packedGitLimit::
|
|
|
|
Maximum number of bytes to map simultaneously into memory
|
|
|
|
from pack files. If Git needs to access more than this many
|
|
|
|
bytes at once to complete an operation it will unmap existing
|
|
|
|
regions to reclaim virtual address space within the process.
|
2007-01-05 03:28:08 +00:00
|
|
|
+
|
|
|
|
Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms.
|
|
|
|
This should be reasonable for all users/operating systems, except on
|
|
|
|
the largest projects. You probably do not need to adjust this value.
|
2006-12-31 03:13:43 +00:00
|
|
|
+
|
|
|
|
Common unit suffixes of 'k', 'm', or 'g' are supported.
|
2006-12-23 07:33:35 +00:00
|
|
|
|
2007-03-19 05:14:37 +00:00
|
|
|
core.deltaBaseCacheLimit::
|
|
|
|
Maximum number of bytes to reserve for caching base objects
|
|
|
|
that multiple deltafied objects reference. By storing the
|
|
|
|
entire decompressed base objects in a cache Git is able
|
|
|
|
to avoid unpacking and decompressing frequently used base
|
|
|
|
objects multiple times.
|
|
|
|
+
|
|
|
|
Default is 16 MiB on all platforms. This should be reasonable
|
|
|
|
for all users/operating systems, except on the largest projects.
|
|
|
|
You probably do not need to adjust this value.
|
|
|
|
+
|
|
|
|
Common unit suffixes of 'k', 'm', or 'g' are supported.
|
|
|
|
|
2010-02-01 17:27:35 +00:00
|
|
|
core.bigFileThreshold::
|
|
|
|
Files larger than this size are stored deflated, without
|
|
|
|
attempting delta compression. Storing large files without
|
|
|
|
delta compression avoids excessive memory usage, at the
|
|
|
|
slight expense of increased disk usage.
|
|
|
|
+
|
|
|
|
Default is 512 MiB on all platforms. This should be reasonable
|
|
|
|
for most projects as source code and other text files can still
|
|
|
|
be delta compressed, but larger binary media files won't be.
|
|
|
|
+
|
|
|
|
Common unit suffixes of 'k', 'm', or 'g' are supported.
|
|
|
|
+
|
|
|
|
Currently only linkgit:git-fast-import[1] honors this setting.
|
|
|
|
|
2007-07-02 16:48:34 +00:00
|
|
|
core.excludesfile::
|
2007-05-22 00:12:17 +00:00
|
|
|
In addition to '.gitignore' (per-directory) and
|
|
|
|
'.git/info/exclude', git looks into this file for patterns
|
2009-11-21 08:37:26 +00:00
|
|
|
of files which are not meant to be tracked. "{tilde}/" is expanded
|
|
|
|
to the value of `$HOME` and "{tilde}user/" to the specified user's
|
2009-11-19 15:21:15 +00:00
|
|
|
home directory. See linkgit:gitignore[5].
|
2007-05-22 00:12:17 +00:00
|
|
|
|
2007-07-20 05:09:35 +00:00
|
|
|
core.editor::
|
|
|
|
Commands such as `commit` and `tag` that lets you edit
|
2007-08-24 00:44:13 +00:00
|
|
|
messages by launching an editor uses the value of this
|
2007-07-20 05:09:35 +00:00
|
|
|
variable when it is set, and the environment variable
|
2009-10-31 01:42:34 +00:00
|
|
|
`GIT_EDITOR` is not set. See linkgit:git-var[1].
|
2007-07-20 05:09:35 +00:00
|
|
|
|
2007-07-03 18:18:11 +00:00
|
|
|
core.pager::
|
2008-08-24 05:28:32 +00:00
|
|
|
The command that git will use to paginate output. Can
|
|
|
|
be overridden with the `GIT_PAGER` environment
|
|
|
|
variable. Note that git sets the `LESS` environment
|
|
|
|
variable to `FRSX` if it is unset when it runs the
|
|
|
|
pager. One can change these settings by setting the
|
2008-09-24 23:21:28 +00:00
|
|
|
`LESS` variable to some other value. Alternately,
|
|
|
|
these settings can be overridden on a project or
|
|
|
|
global basis by setting the `core.pager` option.
|
|
|
|
Setting `core.pager` has no affect on the `LESS`
|
|
|
|
environment variable behaviour above, so if you want
|
|
|
|
to override git's default settings this way, you need
|
|
|
|
to be explicit. For example, to disable the S option
|
|
|
|
in a backward compatible manner, set `core.pager`
|
2009-03-15 11:30:52 +00:00
|
|
|
to `less -+$LESS -FRX`. This will be passed to the
|
2008-09-24 23:21:28 +00:00
|
|
|
shell by git, which will translate the final command to
|
2009-03-15 11:30:52 +00:00
|
|
|
`LESS=FRSX less -+FRSX -FRX`.
|
2007-07-03 18:18:11 +00:00
|
|
|
|
2007-11-24 19:57:41 +00:00
|
|
|
core.whitespace::
|
|
|
|
A comma separated list of common whitespace problems to
|
2010-01-09 23:33:00 +00:00
|
|
|
notice. 'git diff' will use `color.diff.whitespace` to
|
|
|
|
highlight them, and 'git apply --whitespace=error' will
|
2008-07-25 07:34:47 +00:00
|
|
|
consider them as errors. You can prefix `-` to disable
|
|
|
|
any of them (e.g. `-trailing-space`):
|
2007-11-24 19:57:41 +00:00
|
|
|
+
|
2009-09-06 05:21:17 +00:00
|
|
|
* `blank-at-eol` treats trailing whitespaces at the end of the line
|
2007-11-24 19:57:41 +00:00
|
|
|
as an error (enabled by default).
|
|
|
|
* `space-before-tab` treats a space character that appears immediately
|
|
|
|
before a tab character in the initial indent part of the line as an
|
|
|
|
error (enabled by default).
|
|
|
|
* `indent-with-non-tab` treats a line that is indented with 8 or more
|
2007-12-16 16:31:42 +00:00
|
|
|
space characters as an error (not enabled by default).
|
2010-04-02 23:37:08 +00:00
|
|
|
* `tab-in-indent` treats a tab character in the initial indent part of
|
|
|
|
the line as an error (not enabled by default).
|
apply --whitespace=warn/error: diagnose blank at EOF
"git apply" strips new blank lines at EOF under --whitespace=fix option,
but neigher --whitespace=warn nor --whitespace=error paid any attention to
these errors.
Introduce a new whitespace error class, blank-at-eof, to make the
whitespace error handling more consistent.
The patch adds a new "linenr" field to the struct fragment in order to
record which line the hunk started in the input file, but this is needed
solely for reporting purposes. The detection of this class of whitespace
errors cannot be done while parsing a patch like we do for all the other
classes of whitespace errors. It instead has to wait until we find where
to apply the hunk, but at that point, we do not have an access to the
original line number in the input file anymore, hence the new field.
Depending on your point of view, this may be a bugfix that makes warn and
error in line with fix. Or you could call it a new feature. The line
between them is somewhat fuzzy in this case.
Strictly speaking, triggering more errors than before is a change in
behaviour that is not backward compatible, even though the reason for the
change is because the code was not checking for an error that it should
have. People who do not want added blank lines at EOF to trigger an error
can disable the new error class.
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2009-09-03 23:02:32 +00:00
|
|
|
* `blank-at-eof` treats blank lines added at the end of file as an error
|
|
|
|
(enabled by default).
|
2009-09-06 05:21:17 +00:00
|
|
|
* `trailing-space` is a short-hand to cover both `blank-at-eol` and
|
|
|
|
`blank-at-eof`.
|
2008-01-15 08:59:05 +00:00
|
|
|
* `cr-at-eol` treats a carriage-return at the end of line as
|
|
|
|
part of the line terminator, i.e. with it, `trailing-space`
|
|
|
|
does not trigger if the character before such a carriage-return
|
|
|
|
is not a whitespace (not enabled by default).
|
2007-11-24 19:57:41 +00:00
|
|
|
|
2008-06-18 22:18:44 +00:00
|
|
|
core.fsyncobjectfiles::
|
|
|
|
This boolean will enable 'fsync()' when writing object files.
|
|
|
|
+
|
|
|
|
This is a total waste of time and effort on a filesystem that orders
|
|
|
|
data writes properly, but can be useful for filesystems that do not use
|
|
|
|
journalling (traditional UNIX filesystems) or that only journal metadata
|
|
|
|
and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback").
|
|
|
|
|
2008-11-14 00:36:30 +00:00
|
|
|
core.preloadindex::
|
|
|
|
Enable parallel index preload for operations like 'git diff'
|
|
|
|
+
|
|
|
|
This can speed up operations like 'git diff' and 'git status' especially
|
|
|
|
on filesystems like NFS that have weak caching semantics and thus
|
|
|
|
relatively high IO latencies. With this set to 'true', git will do the
|
|
|
|
index comparison to the filesystem data in parallel, allowing
|
|
|
|
overlapping IO's.
|
|
|
|
|
2009-04-27 22:32:25 +00:00
|
|
|
core.createObject::
|
|
|
|
You can set this to 'link', in which case a hardlink followed by
|
|
|
|
a delete of the source are used to make sure that object creation
|
|
|
|
will not overwrite existing objects.
|
|
|
|
+
|
|
|
|
On some file system/operating system combinations, this is unreliable.
|
|
|
|
Set this config setting to 'rename' there; However, This will remove the
|
|
|
|
check that makes sure that existing object files will not get overwritten.
|
2009-04-25 09:57:14 +00:00
|
|
|
|
2009-10-09 10:21:57 +00:00
|
|
|
core.notesRef::
|
|
|
|
When showing commit messages, also show notes which are stored in
|
2010-05-09 03:19:35 +00:00
|
|
|
the given ref. The ref must be fully qualified. If the given
|
|
|
|
ref does not exist, it is not an error but means that no
|
|
|
|
notes should be printed.
|
2009-10-09 10:21:57 +00:00
|
|
|
+
|
2010-05-09 03:19:35 +00:00
|
|
|
This setting defaults to "refs/notes/commits", and it can be overridden by
|
|
|
|
the 'GIT_NOTES_REF' environment variable. See linkgit:git-notes[1].
|
2009-10-09 10:21:57 +00:00
|
|
|
|
2009-08-20 13:47:08 +00:00
|
|
|
core.sparseCheckout::
|
|
|
|
Enable "sparse checkout" feature. See section "Sparse checkout" in
|
|
|
|
linkgit:git-read-tree[1] for more information.
|
|
|
|
|
2009-05-31 05:08:02 +00:00
|
|
|
add.ignore-errors::
|
2010-01-09 23:33:00 +00:00
|
|
|
Tells 'git add' to continue adding files when some files cannot be
|
2009-05-31 05:08:02 +00:00
|
|
|
added due to indexing errors. Equivalent to the '--ignore-errors'
|
|
|
|
option of linkgit:git-add[1].
|
|
|
|
|
2006-06-07 18:43:50 +00:00
|
|
|
alias.*::
|
2007-12-29 06:20:38 +00:00
|
|
|
Command aliases for the linkgit:git[1] command wrapper - e.g.
|
2006-06-07 18:43:50 +00:00
|
|
|
after defining "alias.last = cat-file commit HEAD", the invocation
|
|
|
|
"git last" is equivalent to "git cat-file commit HEAD". To avoid
|
2006-06-08 00:25:21 +00:00
|
|
|
confusion and troubles with script usage, aliases that
|
|
|
|
hide existing git commands are ignored. Arguments are split by
|
|
|
|
spaces, the usual shell quoting and escaping is supported.
|
|
|
|
quote pair and a backslash can be used to quote them.
|
2007-09-01 11:01:54 +00:00
|
|
|
+
|
|
|
|
If the alias expansion is prefixed with an exclamation point,
|
|
|
|
it will be treated as a shell command. For example, defining
|
|
|
|
"alias.new = !gitk --all --not ORIG_HEAD", the invocation
|
|
|
|
"git new" is equivalent to running the shell command
|
2009-07-01 16:00:31 +00:00
|
|
|
"gitk --all --not ORIG_HEAD". Note that shell commands will be
|
|
|
|
executed from the top-level directory of a repository, which may
|
|
|
|
not necessarily be the current directory.
|
2007-02-11 00:33:58 +00:00
|
|
|
|
2010-02-27 14:20:27 +00:00
|
|
|
am.keepcr::
|
|
|
|
If true, git-am will call git-mailsplit for patches in mbox format
|
|
|
|
with parameter '--keep-cr'. In this case git-mailsplit will
|
|
|
|
not remove `\r` from lines ending with `\r\n`. Can be overrriden
|
|
|
|
by giving '--no-keep-cr' from the command line.
|
|
|
|
See linkgit:git-am[1], linkgit:git-mailsplit[1].
|
|
|
|
|
2009-08-04 11:16:49 +00:00
|
|
|
apply.ignorewhitespace::
|
2010-01-09 23:33:00 +00:00
|
|
|
When set to 'change', tells 'git apply' to ignore changes in
|
2009-08-04 11:16:49 +00:00
|
|
|
whitespace, in the same way as the '--ignore-space-change'
|
|
|
|
option.
|
2010-01-09 23:33:00 +00:00
|
|
|
When set to one of: no, none, never, false tells 'git apply' to
|
2009-08-04 11:16:49 +00:00
|
|
|
respect all whitespace differences.
|
|
|
|
See linkgit:git-apply[1].
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
apply.whitespace::
|
2010-01-09 23:33:00 +00:00
|
|
|
Tells 'git apply' how to handle whitespaces, in the same way
|
2007-12-29 06:20:38 +00:00
|
|
|
as the '--whitespace' option. See linkgit:git-apply[1].
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2007-05-23 05:07:54 +00:00
|
|
|
branch.autosetupmerge::
|
2010-01-21 04:28:49 +00:00
|
|
|
Tells 'git branch' and 'git checkout' to set up new branches
|
2008-02-19 16:24:38 +00:00
|
|
|
so that linkgit:git-pull[1] will appropriately merge from the
|
|
|
|
starting point branch. Note that even if this option is not set,
|
2007-05-23 05:07:54 +00:00
|
|
|
this behavior can be chosen per-branch using the `--track`
|
2008-02-19 16:24:38 +00:00
|
|
|
and `--no-track` options. The valid settings are: `false` -- no
|
|
|
|
automatic setup is done; `true` -- automatic setup is done when the
|
|
|
|
starting point is a remote branch; `always` -- automatic setup is
|
|
|
|
done when the starting point is either a local branch or remote
|
|
|
|
branch. This option defaults to true.
|
2007-05-23 05:07:54 +00:00
|
|
|
|
2008-05-10 22:36:29 +00:00
|
|
|
branch.autosetuprebase::
|
2010-01-09 23:33:00 +00:00
|
|
|
When a new branch is created with 'git branch' or 'git checkout'
|
2008-05-10 22:36:29 +00:00
|
|
|
that tracks another branch, this variable tells git to set
|
|
|
|
up pull to rebase instead of merge (see "branch.<name>.rebase").
|
|
|
|
When `never`, rebase is never automatically set to true.
|
|
|
|
When `local`, rebase is set to true for tracked branches of
|
|
|
|
other local branches.
|
|
|
|
When `remote`, rebase is set to true for tracked branches of
|
|
|
|
remote branches.
|
|
|
|
When `always`, rebase will be set to true for all tracking
|
|
|
|
branches.
|
|
|
|
See "branch.autosetupmerge" for details on how to set up a
|
|
|
|
branch to track another branch.
|
|
|
|
This option defaults to never.
|
|
|
|
|
2006-09-23 10:05:43 +00:00
|
|
|
branch.<name>.remote::
|
2010-01-09 23:33:00 +00:00
|
|
|
When in branch <name>, it tells 'git fetch' and 'git push' which
|
2009-03-30 10:11:40 +00:00
|
|
|
remote to fetch from/push to. It defaults to `origin` if no remote is
|
|
|
|
configured. `origin` is also used if you are not on any branch.
|
2006-09-23 10:05:43 +00:00
|
|
|
|
2006-09-23 20:53:04 +00:00
|
|
|
branch.<name>.merge::
|
2009-03-30 10:11:40 +00:00
|
|
|
Defines, together with branch.<name>.remote, the upstream branch
|
2010-01-09 23:33:00 +00:00
|
|
|
for the given branch. It tells 'git fetch'/'git pull' which
|
|
|
|
branch to merge and can also affect 'git push' (see push.default).
|
|
|
|
When in branch <name>, it tells 'git fetch' the default
|
2007-09-11 03:03:25 +00:00
|
|
|
refspec to be marked for merging in FETCH_HEAD. The value is
|
|
|
|
handled like the remote part of a refspec, and must match a
|
|
|
|
ref which is fetched from the remote given by
|
|
|
|
"branch.<name>.remote".
|
2010-01-09 23:33:00 +00:00
|
|
|
The merge information is used by 'git pull' (which at first calls
|
|
|
|
'git fetch') to lookup the default branch for merging. Without
|
|
|
|
this option, 'git pull' defaults to merge the first refspec fetched.
|
2006-12-09 01:28:26 +00:00
|
|
|
Specify multiple values to get an octopus merge.
|
2010-01-09 23:33:00 +00:00
|
|
|
If you wish to setup 'git pull' so that it merges into <name> from
|
git-fetch, git-branch: Support local --track via a special remote '.'
This patch adds support for a dummy remote '.' to avoid having
to declare a fake remote like
[remote "local"]
url = .
fetch = refs/heads/*:refs/heads/*
Such a builtin remote simplifies the operation of "git-fetch",
which will populate FETCH_HEAD but will not pretend that two
repositories are in use, will not create a thin pack, and will
not perform any useless remapping of names. The speed
improvement is around 20%, and it should improve more if
"git-fetch" is converted to a builtin.
To this end, git-parse-remote is grown with a new kind of
remote, 'builtin'. In git-fetch.sh, we treat the builtin remote
specially in that it needs no pack/store operations. In fact,
doing git-fetch on a builtin remote will simply populate
FETCH_HEAD appropriately.
The patch also improves of the --track/--no-track support,
extending it so that branch.<name>.remote items referring '.'
can be created. Finally, it fixes a typo in git-checkout.sh.
Signed-off-by: Paolo Bonzini <bonzini@gnu.org>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-03-15 08:23:20 +00:00
|
|
|
another branch in the local repository, you can point
|
|
|
|
branch.<name>.merge to the desired branch, and use the special setting
|
|
|
|
`.` (a period) for branch.<name>.remote.
|
2006-09-23 20:53:04 +00:00
|
|
|
|
2007-09-23 22:51:43 +00:00
|
|
|
branch.<name>.mergeoptions::
|
|
|
|
Sets default options for merging into branch <name>. The syntax and
|
2009-10-09 18:51:14 +00:00
|
|
|
supported options are the same as those of linkgit:git-merge[1], but
|
2007-09-23 22:51:43 +00:00
|
|
|
option values containing whitespace characters are currently not
|
|
|
|
supported.
|
|
|
|
|
2007-11-28 13:11:07 +00:00
|
|
|
branch.<name>.rebase::
|
|
|
|
When true, rebase the branch <name> on top of the fetched branch,
|
2008-05-08 18:28:07 +00:00
|
|
|
instead of merging the default branch from the default remote when
|
|
|
|
"git pull" is run.
|
2007-11-28 13:11:07 +00:00
|
|
|
*NOTE*: this is a possibly dangerous operation; do *not* use
|
2007-12-29 06:20:38 +00:00
|
|
|
it unless you understand the implications (see linkgit:git-rebase[1]
|
2007-11-28 13:11:07 +00:00
|
|
|
for details).
|
|
|
|
|
2008-03-14 04:56:53 +00:00
|
|
|
browser.<tool>.cmd::
|
|
|
|
Specify the command to invoke the specified browser. The
|
|
|
|
specified command is evaluated in shell with the URLs passed
|
|
|
|
as arguments. (See linkgit:git-web--browse[1].)
|
|
|
|
|
2008-01-29 06:08:22 +00:00
|
|
|
browser.<tool>.path::
|
|
|
|
Override the path for the given tool that may be used to
|
2008-01-29 06:08:44 +00:00
|
|
|
browse HTML help (see '-w' option in linkgit:git-help[1]) or a
|
|
|
|
working repository in gitweb (see linkgit:git-instaweb[1]).
|
2008-01-29 06:08:22 +00:00
|
|
|
|
2007-04-24 00:18:16 +00:00
|
|
|
clean.requireForce::
|
2007-11-02 00:32:04 +00:00
|
|
|
A boolean to make git-clean do nothing unless given -f
|
|
|
|
or -n. Defaults to true.
|
2007-04-24 00:18:16 +00:00
|
|
|
|
2007-01-03 15:36:29 +00:00
|
|
|
color.branch::
|
|
|
|
A boolean to enable/disable color in the output of
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-branch[1]. May be set to `always`,
|
2007-12-06 01:05:17 +00:00
|
|
|
`false` (or `never`) or `auto` (or `true`), in which case colors are used
|
2007-01-03 15:36:29 +00:00
|
|
|
only when the output is to a terminal. Defaults to false.
|
|
|
|
|
|
|
|
color.branch.<slot>::
|
|
|
|
Use customized color for branch coloration. `<slot>` is one of
|
|
|
|
`current` (the current branch), `local` (a local branch),
|
|
|
|
`remote` (a tracking branch in refs/remotes/), `plain` (other
|
2007-01-28 15:17:36 +00:00
|
|
|
refs).
|
|
|
|
+
|
|
|
|
The value for these configuration variables is a list of colors (at most
|
|
|
|
two) and attributes (at most one), separated by spaces. The colors
|
|
|
|
accepted are `normal`, `black`, `red`, `green`, `yellow`, `blue`,
|
|
|
|
`magenta`, `cyan` and `white`; the attributes are `bold`, `dim`, `ul`,
|
|
|
|
`blink` and `reverse`. The first color given is the foreground; the
|
|
|
|
second is the background. The position of the attribute, if any,
|
|
|
|
doesn't matter.
|
2007-01-03 15:36:29 +00:00
|
|
|
|
2006-12-13 09:13:28 +00:00
|
|
|
color.diff::
|
2007-12-06 01:05:17 +00:00
|
|
|
When set to `always`, always use colors in patch.
|
|
|
|
When false (or `never`), never. When set to `true` or `auto`, use
|
|
|
|
colors only when the output is to the terminal. Defaults to false.
|
2006-07-07 12:28:05 +00:00
|
|
|
|
2006-12-13 09:13:28 +00:00
|
|
|
color.diff.<slot>::
|
2007-01-28 15:17:36 +00:00
|
|
|
Use customized color for diff colorization. `<slot>` specifies
|
|
|
|
which part of the patch to use the specified color, and is one
|
|
|
|
of `plain` (context text), `meta` (metainformation), `frag`
|
2009-11-27 06:55:18 +00:00
|
|
|
(hunk header), 'func' (function in hunk header), `old` (removed lines),
|
|
|
|
`new` (added lines), `commit` (commit headers), or `whitespace`
|
|
|
|
(highlighting whitespace errors). The values of these variables may be
|
|
|
|
specified as in color.branch.<slot>.
|
2006-07-07 12:28:05 +00:00
|
|
|
|
2010-06-24 00:21:16 +00:00
|
|
|
color.decorate.<slot>::
|
|
|
|
Use customized color for 'git log --decorate' output. `<slot>` is one
|
|
|
|
of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local
|
|
|
|
branches, remote tracking branches, tags, stash and HEAD, respectively.
|
|
|
|
|
2009-03-07 12:32:32 +00:00
|
|
|
color.grep::
|
|
|
|
When set to `always`, always highlight matches. When `false` (or
|
|
|
|
`never`), never. When set to `true` or `auto`, use color only
|
|
|
|
when the output is written to the terminal. Defaults to `false`.
|
|
|
|
|
grep: Colorize filename, line number, and separator
Colorize the filename, line number, and separator in git grep output, as
GNU grep does. The colors are customizable through color.grep.<slot>.
The default is to only color the separator (in cyan), since this gives
the biggest legibility increase without overwhelming the user with
colors. GNU grep also defaults cyan for the separator, but defaults to
magenta for the filename and to green for the line number, as well.
There is one difference from GNU grep: When a binary file matches
without -a, GNU grep does not color the <file> in "Binary file <file>
matches", but we do.
Like GNU grep, if --null is given, the null separators are not colored.
For config.txt, use a a sub-list to describe the slots, rather than
a single paragraph with parentheses, since this is much more readable.
Remove the cast to int for `rm_eo - rm_so` since it is not necessary.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-07 16:52:46 +00:00
|
|
|
color.grep.<slot>::
|
|
|
|
Use customized color for grep colorization. `<slot>` specifies which
|
|
|
|
part of the line to use the specified color, and is one of
|
|
|
|
+
|
|
|
|
--
|
2010-03-07 16:52:47 +00:00
|
|
|
`context`;;
|
|
|
|
non-matching text in context lines (when using `-A`, `-B`, or `-C`)
|
grep: Colorize filename, line number, and separator
Colorize the filename, line number, and separator in git grep output, as
GNU grep does. The colors are customizable through color.grep.<slot>.
The default is to only color the separator (in cyan), since this gives
the biggest legibility increase without overwhelming the user with
colors. GNU grep also defaults cyan for the separator, but defaults to
magenta for the filename and to green for the line number, as well.
There is one difference from GNU grep: When a binary file matches
without -a, GNU grep does not color the <file> in "Binary file <file>
matches", but we do.
Like GNU grep, if --null is given, the null separators are not colored.
For config.txt, use a a sub-list to describe the slots, rather than
a single paragraph with parentheses, since this is much more readable.
Remove the cast to int for `rm_eo - rm_so` since it is not necessary.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-07 16:52:46 +00:00
|
|
|
`filename`;;
|
|
|
|
filename prefix (when not using `-h`)
|
2010-03-07 16:52:47 +00:00
|
|
|
`function`;;
|
|
|
|
function name lines (when using `-p`)
|
grep: Colorize filename, line number, and separator
Colorize the filename, line number, and separator in git grep output, as
GNU grep does. The colors are customizable through color.grep.<slot>.
The default is to only color the separator (in cyan), since this gives
the biggest legibility increase without overwhelming the user with
colors. GNU grep also defaults cyan for the separator, but defaults to
magenta for the filename and to green for the line number, as well.
There is one difference from GNU grep: When a binary file matches
without -a, GNU grep does not color the <file> in "Binary file <file>
matches", but we do.
Like GNU grep, if --null is given, the null separators are not colored.
For config.txt, use a a sub-list to describe the slots, rather than
a single paragraph with parentheses, since this is much more readable.
Remove the cast to int for `rm_eo - rm_so` since it is not necessary.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-07 16:52:46 +00:00
|
|
|
`linenumber`;;
|
|
|
|
line number prefix (when using `-n`)
|
|
|
|
`match`;;
|
|
|
|
matching text
|
2010-03-07 16:52:47 +00:00
|
|
|
`selected`;;
|
|
|
|
non-matching text in selected lines
|
grep: Colorize filename, line number, and separator
Colorize the filename, line number, and separator in git grep output, as
GNU grep does. The colors are customizable through color.grep.<slot>.
The default is to only color the separator (in cyan), since this gives
the biggest legibility increase without overwhelming the user with
colors. GNU grep also defaults cyan for the separator, but defaults to
magenta for the filename and to green for the line number, as well.
There is one difference from GNU grep: When a binary file matches
without -a, GNU grep does not color the <file> in "Binary file <file>
matches", but we do.
Like GNU grep, if --null is given, the null separators are not colored.
For config.txt, use a a sub-list to describe the slots, rather than
a single paragraph with parentheses, since this is much more readable.
Remove the cast to int for `rm_eo - rm_so` since it is not necessary.
Signed-off-by: Mark Lodato <lodatom@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
2010-03-07 16:52:46 +00:00
|
|
|
`separator`;;
|
|
|
|
separators between fields on a line (`:`, `-`, and `=`)
|
|
|
|
and between hunks (`--`)
|
|
|
|
--
|
|
|
|
+
|
|
|
|
The values of these variables may be specified as in color.branch.<slot>.
|
2009-03-07 12:32:32 +00:00
|
|
|
|
2007-12-05 08:50:23 +00:00
|
|
|
color.interactive::
|
2008-01-05 09:57:44 +00:00
|
|
|
When set to `always`, always use colors for interactive prompts
|
2008-07-03 05:28:15 +00:00
|
|
|
and displays (such as those used by "git-add --interactive").
|
2007-12-05 08:50:23 +00:00
|
|
|
When false (or `never`), never. When set to `true` or `auto`, use
|
|
|
|
colors only when the output is to the terminal. Defaults to false.
|
|
|
|
|
|
|
|
color.interactive.<slot>::
|
2010-01-09 23:33:00 +00:00
|
|
|
Use customized color for 'git add --interactive'
|
2009-02-05 08:28:27 +00:00
|
|
|
output. `<slot>` may be `prompt`, `header`, `help` or `error`, for
|
|
|
|
four distinct types of normal output from interactive
|
2009-08-07 14:24:21 +00:00
|
|
|
commands. The values of these variables may be specified as
|
2007-12-05 08:50:23 +00:00
|
|
|
in color.branch.<slot>.
|
|
|
|
|
2006-12-13 20:11:03 +00:00
|
|
|
color.pager::
|
|
|
|
A boolean to enable/disable colored output when the pager is in
|
|
|
|
use (default is true).
|
|
|
|
|
2009-04-22 21:41:25 +00:00
|
|
|
color.showbranch::
|
|
|
|
A boolean to enable/disable color in the output of
|
|
|
|
linkgit:git-show-branch[1]. May be set to `always`,
|
|
|
|
`false` (or `never`) or `auto` (or `true`), in which case colors are used
|
|
|
|
only when the output is to a terminal. Defaults to false.
|
|
|
|
|
2006-12-13 20:11:03 +00:00
|
|
|
color.status::
|
|
|
|
A boolean to enable/disable color in the output of
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-status[1]. May be set to `always`,
|
2007-12-06 01:05:17 +00:00
|
|
|
`false` (or `never`) or `auto` (or `true`), in which case colors are used
|
2006-12-13 20:11:03 +00:00
|
|
|
only when the output is to a terminal. Defaults to false.
|
|
|
|
|
|
|
|
color.status.<slot>::
|
|
|
|
Use customized color for status colorization. `<slot>` is
|
|
|
|
one of `header` (the header text of the status message),
|
2006-12-16 02:53:13 +00:00
|
|
|
`added` or `updated` (files which are added but not committed),
|
|
|
|
`changed` (files which are changed but not added in the index),
|
2008-05-22 12:50:02 +00:00
|
|
|
`untracked` (files which are not tracked by git), or
|
|
|
|
`nobranch` (the color the 'no branch' warning is shown in, defaulting
|
|
|
|
to red). The values of these variables may be specified as in
|
|
|
|
color.branch.<slot>.
|
2006-12-13 20:11:03 +00:00
|
|
|
|
2008-02-18 07:26:03 +00:00
|
|
|
color.ui::
|
|
|
|
When set to `always`, always use colors in all git commands which
|
|
|
|
are capable of colored output. When false (or `never`), never. When
|
|
|
|
set to `true` or `auto`, use colors only when the output is to the
|
|
|
|
terminal. When more specific variables of color.* are set, they always
|
|
|
|
take precedence over this setting. Defaults to false.
|
|
|
|
|
2010-01-23 22:13:17 +00:00
|
|
|
commit.status::
|
2009-12-07 22:45:27 +00:00
|
|
|
A boolean to enable/disable inclusion of status information in the
|
|
|
|
commit message template when using an editor to prepare the commit
|
|
|
|
message. Defaults to true.
|
|
|
|
|
2008-11-26 08:26:50 +00:00
|
|
|
commit.template::
|
|
|
|
Specify a file to use as the template for new commit messages.
|
2009-11-21 08:37:26 +00:00
|
|
|
"{tilde}/" is expanded to the value of `$HOME` and "{tilde}user/" to the
|
2009-11-19 15:21:15 +00:00
|
|
|
specified user's home directory.
|
2008-11-26 08:26:50 +00:00
|
|
|
|
2007-08-31 20:13:42 +00:00
|
|
|
diff.autorefreshindex::
|
2010-01-09 23:33:00 +00:00
|
|
|
When using 'git diff' to compare with work tree
|
2007-08-31 20:13:42 +00:00
|
|
|
files, do not consider stat-only change as changed.
|
|
|
|
Instead, silently run `git update-index --refresh` to
|
|
|
|
update the cached stat information for paths whose
|
|
|
|
contents in the work tree match the contents in the
|
|
|
|
index. This option defaults to true. Note that this
|
2010-01-09 23:33:00 +00:00
|
|
|
affects only 'git diff' Porcelain, and not lower level
|
2010-01-21 04:28:49 +00:00
|
|
|
'diff' commands such as 'git diff-files'.
|
2007-08-31 20:13:42 +00:00
|
|
|
|
2007-12-17 12:21:22 +00:00
|
|
|
diff.external::
|
|
|
|
If this config variable is set, diff generation is not
|
|
|
|
performed using the internal diff machinery, but using the
|
2008-07-27 11:12:15 +00:00
|
|
|
given command. Can be overridden with the `GIT_EXTERNAL_DIFF'
|
|
|
|
environment variable. The command is called with parameters
|
|
|
|
as described under "git Diffs" in linkgit:git[1]. Note: if
|
|
|
|
you want to use an external diff program only on a subset of
|
|
|
|
your files, you might want to use linkgit:gitattributes[5] instead.
|
2007-12-17 12:21:22 +00:00
|
|
|
|
2008-08-19 03:08:09 +00:00
|
|
|
diff.mnemonicprefix::
|
2010-01-09 23:33:00 +00:00
|
|
|
If set, 'git diff' uses a prefix pair that is different from the
|
2008-08-19 03:08:09 +00:00
|
|
|
standard "a/" and "b/" depending on what is being compared. When
|
|
|
|
this configuration is in effect, reverse diff output also swaps
|
|
|
|
the order of the prefixes:
|
2010-05-03 02:03:41 +00:00
|
|
|
diff.noprefix::
|
|
|
|
If set, 'git diff' does not show any source or destination prefix.
|
2010-01-07 16:49:12 +00:00
|
|
|
`git diff`;;
|
2008-08-19 03:08:09 +00:00
|
|
|
compares the (i)ndex and the (w)ork tree;
|
2010-01-07 16:49:12 +00:00
|
|
|
`git diff HEAD`;;
|
2008-08-19 03:08:09 +00:00
|
|
|
compares a (c)ommit and the (w)ork tree;
|
2010-01-07 16:49:12 +00:00
|
|
|
`git diff --cached`;;
|
2008-08-19 03:08:09 +00:00
|
|
|
compares a (c)ommit and the (i)ndex;
|
2010-01-07 16:49:12 +00:00
|
|
|
`git diff HEAD:file1 file2`;;
|
2008-08-19 03:08:09 +00:00
|
|
|
compares an (o)bject and a (w)ork tree entity;
|
2010-01-07 16:49:12 +00:00
|
|
|
`git diff --no-index a b`;;
|
2008-08-19 03:08:09 +00:00
|
|
|
compares two non-git things (1) and (2).
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
diff.renameLimit::
|
|
|
|
The number of files to consider when performing the copy/rename
|
2010-01-09 23:33:00 +00:00
|
|
|
detection; equivalent to the 'git diff' option '-l'.
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2006-07-07 11:01:23 +00:00
|
|
|
diff.renames::
|
|
|
|
Tells git to detect renames. If set to any boolean value, it
|
|
|
|
will enable basic rename detection. If set to "copies" or
|
|
|
|
"copy", it will detect copies, as well.
|
|
|
|
|
2009-01-20 21:08:33 +00:00
|
|
|
diff.suppressBlankEmpty::
|
2008-12-21 22:28:25 +00:00
|
|
|
A boolean to inhibit the standard behavior of printing a space
|
|
|
|
before each empty output line. Defaults to false.
|
|
|
|
|
2009-04-07 08:21:20 +00:00
|
|
|
diff.tool::
|
|
|
|
Controls which diff tool is used. `diff.tool` overrides
|
|
|
|
`merge.tool` when used by linkgit:git-difftool[1] and has
|
|
|
|
the same valid values as `merge.tool` minus "tortoisemerge"
|
|
|
|
and plus "kompare".
|
|
|
|
|
|
|
|
difftool.<tool>.path::
|
|
|
|
Override the path for the given tool. This is useful in case
|
|
|
|
your tool is not in the PATH.
|
|
|
|
|
|
|
|
difftool.<tool>.cmd::
|
|
|
|
Specify the command to invoke the specified diff tool.
|
|
|
|
The specified command is evaluated in shell with the following
|
|
|
|
variables available: 'LOCAL' is set to the name of the temporary
|
|
|
|
file containing the contents of the diff pre-image and 'REMOTE'
|
|
|
|
is set to the name of the temporary file containing the contents
|
|
|
|
of the diff post-image.
|
|
|
|
|
2009-04-07 08:21:22 +00:00
|
|
|
difftool.prompt::
|
|
|
|
Prompt before each invocation of the diff tool.
|
|
|
|
|
2009-01-21 04:59:54 +00:00
|
|
|
diff.wordRegex::
|
2009-01-21 03:46:57 +00:00
|
|
|
A POSIX Extended Regular Expression used to determine what is a "word"
|
|
|
|
when performing word-by-word difference calculations. Character
|
|
|
|
sequences that match the regular expression are "words", all other
|
|
|
|
characters are *ignorable* whitespace.
|
|
|
|
|
2007-01-25 00:47:24 +00:00
|
|
|
fetch.unpackLimit::
|
|
|
|
If the number of objects fetched over the git native
|
|
|
|
transfer is below this
|
|
|
|
limit, then the objects will be unpacked into loose object
|
|
|
|
files. However if the number of received objects equals or
|
|
|
|
exceeds this limit then the received pack will be stored as
|
|
|
|
a pack, after adding any missing delta bases. Storing the
|
|
|
|
pack from a push can make the push operation complete faster,
|
2008-01-11 21:11:13 +00:00
|
|
|
especially on slow filesystems. If not set, the value of
|
|
|
|
`transfer.unpackLimit` is used instead.
|
2007-01-25 00:47:24 +00:00
|
|
|
|
2009-04-23 09:37:56 +00:00
|
|
|
format.attach::
|
|
|
|
Enable multipart/mixed attachments as the default for
|
|
|
|
'format-patch'. The value can also be a double quoted string
|
|
|
|
which will enable attachments as the default and set the
|
|
|
|
value as the boundary. See the --attach option in
|
|
|
|
linkgit:git-format-patch[1].
|
|
|
|
|
2007-11-04 03:38:24 +00:00
|
|
|
format.numbered::
|
2008-10-02 20:55:39 +00:00
|
|
|
A boolean which can enable or disable sequence numbers in patch
|
|
|
|
subjects. It defaults to "auto" which enables it only if there
|
|
|
|
is more than one patch. It can be enabled or disabled for all
|
|
|
|
messages by setting it to "true" or "false". See --numbered
|
|
|
|
option in linkgit:git-format-patch[1].
|
2007-11-04 03:38:24 +00:00
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
format.headers::
|
|
|
|
Additional email headers to include in a patch to be submitted
|
2007-12-29 06:20:38 +00:00
|
|
|
by mail. See linkgit:git-format-patch[1].
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2010-07-12 18:58:38 +00:00
|
|
|
format.to::
|
2009-04-23 09:37:56 +00:00
|
|
|
format.cc::
|
2010-07-12 18:58:38 +00:00
|
|
|
Additional recipients to include in a patch to be submitted
|
|
|
|
by mail. See the --to and --cc options in
|
|
|
|
linkgit:git-format-patch[1].
|
2009-04-23 09:37:56 +00:00
|
|
|
|
|
|
|
format.subjectprefix::
|
|
|
|
The default for format-patch is to output files with the '[PATCH]'
|
|
|
|
subject prefix. Use this variable to change that prefix.
|
|
|
|
|
2010-06-16 05:59:25 +00:00
|
|
|
format.signature::
|
|
|
|
The default for format-patch is to output a signature containing
|
|
|
|
the git version number. Use this variable to change that default.
|
|
|
|
Set this variable to the empty string ("") to suppress
|
|
|
|
signature generation.
|
|
|
|
|
2007-03-03 23:17:23 +00:00
|
|
|
format.suffix::
|
|
|
|
The default for format-patch is to output files with the suffix
|
|
|
|
`.patch`. Use this variable to change that suffix (make sure to
|
|
|
|
include the dot if you want it).
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2008-03-02 09:05:53 +00:00
|
|
|
format.pretty::
|
|
|
|
The default pretty format for log/show/whatchanged command,
|
|
|
|
See linkgit:git-log[1], linkgit:git-show[1],
|
|
|
|
linkgit:git-whatchanged[1].
|
|
|
|
|
2009-02-19 21:26:33 +00:00
|
|
|
format.thread::
|
2010-01-09 23:33:00 +00:00
|
|
|
The default threading style for 'git format-patch'. Can be
|
2010-01-10 03:01:21 +00:00
|
|
|
a boolean value, or `shallow` or `deep`. `shallow` threading
|
|
|
|
makes every mail a reply to the head of the series,
|
2009-02-19 21:26:33 +00:00
|
|
|
where the head is chosen from the cover letter, the
|
|
|
|
`\--in-reply-to`, and the first patch mail, in this order.
|
2009-04-23 09:37:57 +00:00
|
|
|
`deep` threading makes every mail a reply to the previous one.
|
2009-02-19 21:26:33 +00:00
|
|
|
A true boolean value is the same as `shallow`, and a false
|
|
|
|
value disables threading.
|
|
|
|
|
2009-04-01 17:51:54 +00:00
|
|
|
format.signoff::
|
|
|
|
A boolean value which lets you enable the `-s/--signoff` option of
|
|
|
|
format-patch by default. *Note:* Adding the Signed-off-by: line to a
|
|
|
|
patch should be a conscious act and means that you certify you have
|
|
|
|
the rights to submit this work under the same open source license.
|
|
|
|
Please see the 'SubmittingPatches' document for further discussion.
|
|
|
|
|
2007-05-09 19:48:39 +00:00
|
|
|
gc.aggressiveWindow::
|
|
|
|
The window size parameter used in the delta compression
|
2010-01-09 23:33:00 +00:00
|
|
|
algorithm used by 'git gc --aggressive'. This defaults
|
2010-04-13 16:52:55 +00:00
|
|
|
to 250.
|
2007-05-09 19:48:39 +00:00
|
|
|
|
2007-09-17 07:39:52 +00:00
|
|
|
gc.auto::
|
|
|
|
When there are approximately more than this many loose
|
|
|
|
objects in the repository, `git gc --auto` will pack them.
|
|
|
|
Some Porcelain commands use this command to perform a
|
2008-01-11 21:11:13 +00:00
|
|
|
light-weight garbage collection from time to time. The
|
|
|
|
default value is 6700. Setting this to 0 disables it.
|
2007-09-17 07:39:52 +00:00
|
|
|
|
2007-09-17 07:55:13 +00:00
|
|
|
gc.autopacklimit::
|
|
|
|
When there are more than this many packs that are not
|
|
|
|
marked with `*.keep` file in the repository, `git gc
|
2008-01-11 21:11:13 +00:00
|
|
|
--auto` consolidates them into one larger pack. The
|
2008-03-23 07:04:48 +00:00
|
|
|
default value is 50. Setting this to 0 disables it.
|
2007-09-17 07:55:13 +00:00
|
|
|
|
2007-02-13 13:01:42 +00:00
|
|
|
gc.packrefs::
|
2010-01-10 02:59:41 +00:00
|
|
|
Running `git pack-refs` in a repository renders it
|
|
|
|
unclonable by Git versions prior to 1.5.1.2 over dumb
|
|
|
|
transports such as HTTP. This variable determines whether
|
2010-01-21 04:28:49 +00:00
|
|
|
'git gc' runs `git pack-refs`. This can be set to `nobare`
|
2010-01-10 02:59:41 +00:00
|
|
|
to enable it within all non-bare repos or it can be set to a
|
|
|
|
boolean value. The default is `true`.
|
2007-02-13 13:01:42 +00:00
|
|
|
|
gc: call "prune --expire 2.weeks.ago" by default
The only reason we did not call "prune" in git-gc was that it is an
inherently dangerous operation: if there is a commit going on, you will
prune loose objects that were just created, and are, in fact, needed by the
commit object just about to be created.
Since it is dangerous, we told users so. That led to many users not even
daring to run it when it was actually safe. Besides, they are users, and
should not have to remember such details as when to call git-gc with
--prune, or to call git-prune directly.
Of course, the consequence was that "git gc --auto" gets triggered much
more often than we would like, since unreferenced loose objects (such as
left-overs from a rebase or a reset --hard) were never pruned.
Alas, git-prune recently learnt the option --expire <minimum-age>, which
makes it a much safer operation. This allows us to call prune from git-gc,
with a grace period of 2 weeks for the unreferenced loose objects (this
value was determined in a discussion on the git list as a safe one).
If you want to override this grace period, just set the config variable
gc.pruneExpire to a different value; an example would be
[gc]
pruneExpire = 6.months.ago
or even "never", if you feel really paranoid.
Note that this new behaviour makes "--prune" be a no-op.
While adding a test to t5304-prune.sh (since it really tests the implicit
call to "prune"), also the original test for "prune --expire" was moved
there from t1410-reflog.sh, where it did not belong.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2008-03-12 20:55:47 +00:00
|
|
|
gc.pruneexpire::
|
2010-01-09 23:33:00 +00:00
|
|
|
When 'git gc' is run, it will call 'prune --expire 2.weeks.ago'.
|
2008-12-30 19:45:11 +00:00
|
|
|
Override the grace period with this config variable. The value
|
|
|
|
"now" may be used to disable this grace period and always prune
|
|
|
|
unreachable objects immediately.
|
gc: call "prune --expire 2.weeks.ago" by default
The only reason we did not call "prune" in git-gc was that it is an
inherently dangerous operation: if there is a commit going on, you will
prune loose objects that were just created, and are, in fact, needed by the
commit object just about to be created.
Since it is dangerous, we told users so. That led to many users not even
daring to run it when it was actually safe. Besides, they are users, and
should not have to remember such details as when to call git-gc with
--prune, or to call git-prune directly.
Of course, the consequence was that "git gc --auto" gets triggered much
more often than we would like, since unreferenced loose objects (such as
left-overs from a rebase or a reset --hard) were never pruned.
Alas, git-prune recently learnt the option --expire <minimum-age>, which
makes it a much safer operation. This allows us to call prune from git-gc,
with a grace period of 2 weeks for the unreferenced loose objects (this
value was determined in a discussion on the git list as a safe one).
If you want to override this grace period, just set the config variable
gc.pruneExpire to a different value; an example would be
[gc]
pruneExpire = 6.months.ago
or even "never", if you feel really paranoid.
Note that this new behaviour makes "--prune" be a no-op.
While adding a test to t5304-prune.sh (since it really tests the implicit
call to "prune"), also the original test for "prune --expire" was moved
there from t1410-reflog.sh, where it did not belong.
Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
2008-03-12 20:55:47 +00:00
|
|
|
|
2006-12-27 09:47:57 +00:00
|
|
|
gc.reflogexpire::
|
2010-04-14 20:12:34 +00:00
|
|
|
gc.<pattern>.reflogexpire::
|
2010-01-09 23:33:00 +00:00
|
|
|
'git reflog expire' removes reflog entries older than
|
2010-04-14 20:12:34 +00:00
|
|
|
this time; defaults to 90 days. With "<pattern>" (e.g.
|
|
|
|
"refs/stash") in the middle the setting applies only to
|
|
|
|
the refs that match the <pattern>.
|
2006-12-27 09:47:57 +00:00
|
|
|
|
|
|
|
gc.reflogexpireunreachable::
|
2010-04-14 20:12:34 +00:00
|
|
|
gc.<ref>.reflogexpireunreachable::
|
2010-01-09 23:33:00 +00:00
|
|
|
'git reflog expire' removes reflog entries older than
|
2006-12-27 09:47:57 +00:00
|
|
|
this time and are not reachable from the current tip;
|
2010-04-14 20:12:34 +00:00
|
|
|
defaults to 30 days. With "<pattern>" (e.g. "refs/stash")
|
|
|
|
in the middle, the setting applies only to the refs that
|
|
|
|
match the <pattern>.
|
2006-12-27 09:47:57 +00:00
|
|
|
|
2006-12-27 09:24:05 +00:00
|
|
|
gc.rerereresolved::
|
|
|
|
Records of conflicted merge you resolved earlier are
|
2010-01-09 23:33:00 +00:00
|
|
|
kept for this many days when 'git rerere gc' is run.
|
2007-12-29 06:20:38 +00:00
|
|
|
The default is 60 days. See linkgit:git-rerere[1].
|
2006-12-27 09:24:05 +00:00
|
|
|
|
|
|
|
gc.rerereunresolved::
|
|
|
|
Records of conflicted merge you have not resolved are
|
2010-01-09 23:33:00 +00:00
|
|
|
kept for this many days when 'git rerere gc' is run.
|
2007-12-29 06:20:38 +00:00
|
|
|
The default is 15 days. See linkgit:git-rerere[1].
|
2006-12-27 09:24:05 +00:00
|
|
|
|
2009-01-02 15:40:13 +00:00
|
|
|
gitcvs.commitmsgannotation::
|
|
|
|
Append this string to each commit message. Set to empty string
|
|
|
|
to disable this feature. Defaults to "via git-CVS emulator".
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
gitcvs.enabled::
|
2007-08-24 00:40:08 +00:00
|
|
|
Whether the CVS server interface is enabled for this repository.
|
2007-12-29 06:20:38 +00:00
|
|
|
See linkgit:git-cvsserver[1].
|
2006-04-24 22:59:33 +00:00
|
|
|
|
|
|
|
gitcvs.logfile::
|
2007-08-24 00:40:08 +00:00
|
|
|
Path to a log file where the CVS server interface well... logs
|
2007-12-29 06:20:38 +00:00
|
|
|
various stuff. See linkgit:git-cvsserver[1].
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2008-08-29 07:29:42 +00:00
|
|
|
gitcvs.usecrlfattr::
|
2010-05-19 20:43:11 +00:00
|
|
|
If true, the server will look up the end-of-line conversion
|
|
|
|
attributes for files to determine the '-k' modes to use. If
|
|
|
|
the attributes force git to treat a file as text,
|
|
|
|
the '-k' mode will be left blank so cvs clients will
|
|
|
|
treat it as text. If they suppress text conversion, the file
|
2008-08-05 16:12:05 +00:00
|
|
|
will be set with '-kb' mode, which suppresses any newline munging
|
2010-05-19 20:43:11 +00:00
|
|
|
the client might otherwise do. If the attributes do not allow
|
|
|
|
the file type to be determined, then 'gitcvs.allbinary' is
|
|
|
|
used. See linkgit:gitattributes[5].
|
2008-05-15 04:35:47 +00:00
|
|
|
|
2007-04-13 16:02:30 +00:00
|
|
|
gitcvs.allbinary::
|
2008-05-15 04:35:48 +00:00
|
|
|
This is used if 'gitcvs.usecrlfattr' does not resolve
|
|
|
|
the correct '-kb' mode to use. If true, all
|
|
|
|
unresolved files are sent to the client in
|
|
|
|
mode '-kb'. This causes the client to treat them
|
|
|
|
as binary files, which suppresses any newline munging it
|
|
|
|
otherwise might do. Alternatively, if it is set to "guess",
|
|
|
|
then the contents of the file are examined to decide if
|
|
|
|
it is binary, similar to 'core.autocrlf'.
|
2007-04-18 05:17:46 +00:00
|
|
|
|
2007-04-13 16:13:42 +00:00
|
|
|
gitcvs.dbname::
|
|
|
|
Database used by git-cvsserver to cache revision information
|
|
|
|
derived from the git repository. The exact meaning depends on the
|
|
|
|
used database driver, for SQLite (which is the default driver) this
|
|
|
|
is a filename. Supports variable substitution (see
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`).
|
2007-04-13 16:13:42 +00:00
|
|
|
Default: '%Ggitcvs.%m.sqlite'
|
|
|
|
|
|
|
|
gitcvs.dbdriver::
|
|
|
|
Used Perl DBI driver. You can specify any available driver
|
|
|
|
for this here, but it might not work. git-cvsserver is tested
|
|
|
|
with 'DBD::SQLite', reported to work with 'DBD::Pg', and
|
|
|
|
reported *not* to work with 'DBD::mysql'. Experimental feature.
|
|
|
|
May not contain double colons (`:`). Default: 'SQLite'.
|
2007-12-29 06:20:38 +00:00
|
|
|
See linkgit:git-cvsserver[1].
|
2007-04-13 16:02:30 +00:00
|
|
|
|
2007-04-13 16:13:42 +00:00
|
|
|
gitcvs.dbuser, gitcvs.dbpass::
|
|
|
|
Database user and password. Only useful if setting 'gitcvs.dbdriver',
|
|
|
|
since SQLite has no concept of database users and/or passwords.
|
|
|
|
'gitcvs.dbuser' supports variable substitution (see
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-cvsserver[1] for details).
|
2007-04-13 16:13:42 +00:00
|
|
|
|
2008-03-27 21:02:14 +00:00
|
|
|
gitcvs.dbTableNamePrefix::
|
|
|
|
Database table name prefix. Prepended to the names of any
|
|
|
|
database tables used, allowing a single database to be used
|
|
|
|
for several repositories. Supports variable substitution (see
|
|
|
|
linkgit:git-cvsserver[1] for details). Any non-alphabetic
|
|
|
|
characters will be replaced with underscores.
|
|
|
|
|
2008-05-15 04:35:47 +00:00
|
|
|
All gitcvs variables except for 'gitcvs.usecrlfattr' and
|
|
|
|
'gitcvs.allbinary' can also be specified as
|
|
|
|
'gitcvs.<access_method>.<varname>' (where 'access_method'
|
2007-08-24 00:44:13 +00:00
|
|
|
is one of "ext" and "pserver") to make them apply only for the given
|
|
|
|
access method.
|
2007-04-13 16:13:42 +00:00
|
|
|
|
2008-05-08 08:55:02 +00:00
|
|
|
gui.commitmsgwidth::
|
|
|
|
Defines how wide the commit message window is in the
|
|
|
|
linkgit:git-gui[1]. "75" is the default.
|
|
|
|
|
|
|
|
gui.diffcontext::
|
|
|
|
Specifies how many context lines should be used in calls to diff
|
|
|
|
made by the linkgit:git-gui[1]. The default is "5".
|
|
|
|
|
2008-11-13 17:28:49 +00:00
|
|
|
gui.encoding::
|
|
|
|
Specifies the default encoding to use for displaying of
|
|
|
|
file contents in linkgit:git-gui[1] and linkgit:gitk[1].
|
|
|
|
It can be overridden by setting the 'encoding' attribute
|
|
|
|
for relevant files (see linkgit:gitattributes[5]).
|
|
|
|
If this option is not set, the tools default to the
|
|
|
|
locale encoding.
|
|
|
|
|
2008-05-08 08:55:02 +00:00
|
|
|
gui.matchtrackingbranch::
|
|
|
|
Determines if new branches created with linkgit:git-gui[1] should
|
|
|
|
default to tracking remote branches with matching names or
|
|
|
|
not. Default: "false".
|
|
|
|
|
|
|
|
gui.newbranchtemplate::
|
|
|
|
Is used as suggested name when creating new branches using the
|
|
|
|
linkgit:git-gui[1].
|
|
|
|
|
|
|
|
gui.pruneduringfetch::
|
|
|
|
"true" if linkgit:git-gui[1] should prune tracking branches when
|
|
|
|
performing a fetch. The default value is "false".
|
|
|
|
|
|
|
|
gui.trustmtime::
|
|
|
|
Determines if linkgit:git-gui[1] should trust the file modification
|
|
|
|
timestamp or not. By default the timestamps are not trusted.
|
|
|
|
|
|
|
|
gui.spellingdictionary::
|
|
|
|
Specifies the dictionary used for spell checking commit messages in
|
|
|
|
the linkgit:git-gui[1]. When set to "none" spell checking is turned
|
|
|
|
off.
|
|
|
|
|
2008-11-13 17:28:49 +00:00
|
|
|
gui.fastcopyblame::
|
2010-01-07 16:49:12 +00:00
|
|
|
If true, 'git gui blame' uses `-C` instead of `-C -C` for original
|
2008-11-13 17:28:49 +00:00
|
|
|
location detection. It makes blame significantly faster on huge
|
|
|
|
repositories at the expense of less thorough copy detection.
|
|
|
|
|
|
|
|
gui.copyblamethreshold::
|
2008-11-27 07:32:01 +00:00
|
|
|
Specifies the threshold to use in 'git gui blame' original location
|
2008-11-13 17:28:49 +00:00
|
|
|
detection, measured in alphanumeric characters. See the
|
|
|
|
linkgit:git-blame[1] manual for more information on copy detection.
|
|
|
|
|
|
|
|
gui.blamehistoryctx::
|
|
|
|
Specifies the radius of history context in days to show in
|
|
|
|
linkgit:gitk[1] for the selected commit, when the `Show History
|
|
|
|
Context` menu item is invoked from 'git gui blame'. If this
|
|
|
|
variable is set to zero, the whole history is shown.
|
|
|
|
|
2008-12-14 19:44:32 +00:00
|
|
|
guitool.<name>.cmd::
|
|
|
|
Specifies the shell command line to execute when the corresponding item
|
|
|
|
of the linkgit:git-gui[1] `Tools` menu is invoked. This option is
|
|
|
|
mandatory for every tool. The command is executed from the root of
|
|
|
|
the working directory, and in the environment it receives the name of
|
|
|
|
the tool as 'GIT_GUITOOL', the name of the currently selected file as
|
|
|
|
'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if
|
|
|
|
the head is detached, 'CUR_BRANCH' is empty).
|
|
|
|
|
|
|
|
guitool.<name>.needsfile::
|
|
|
|
Run the tool only if a diff is selected in the GUI. It guarantees
|
|
|
|
that 'FILENAME' is not empty.
|
|
|
|
|
|
|
|
guitool.<name>.noconsole::
|
|
|
|
Run the command silently, without creating a window to display its
|
|
|
|
output.
|
|
|
|
|
|
|
|
guitool.<name>.norescan::
|
|
|
|
Don't rescan the working directory for changes after the tool
|
|
|
|
finishes execution.
|
|
|
|
|
|
|
|
guitool.<name>.confirm::
|
|
|
|
Show a confirmation dialog before actually running the tool.
|
|
|
|
|
|
|
|
guitool.<name>.argprompt::
|
|
|
|
Request a string argument from the user, and pass it to the tool
|
|
|
|
through the 'ARGS' environment variable. Since requesting an
|
|
|
|
argument implies confirmation, the 'confirm' option has no effect
|
|
|
|
if this is enabled. If the option is set to 'true', 'yes', or '1',
|
|
|
|
the dialog uses a built-in generic prompt; otherwise the exact
|
|
|
|
value of the variable is used.
|
|
|
|
|
|
|
|
guitool.<name>.revprompt::
|
|
|
|
Request a single valid revision from the user, and set the
|
|
|
|
'REVISION' environment variable. In other aspects this option
|
|
|
|
is similar to 'argprompt', and can be used together with it.
|
|
|
|
|
|
|
|
guitool.<name>.revunmerged::
|
|
|
|
Show only unmerged branches in the 'revprompt' subdialog.
|
|
|
|
This is useful for tools similar to merge or rebase, but not
|
|
|
|
for things like checkout or reset.
|
|
|
|
|
|
|
|
guitool.<name>.title::
|
|
|
|
Specifies the title to use for the prompt dialog. The default
|
|
|
|
is the tool name.
|
|
|
|
|
|
|
|
guitool.<name>.prompt::
|
|
|
|
Specifies the general prompt string to display at the top of
|
|
|
|
the dialog, before subsections for 'argprompt' and 'revprompt'.
|
|
|
|
The default value includes the actual command.
|
|
|
|
|
2008-01-08 03:55:14 +00:00
|
|
|
help.browser::
|
|
|
|
Specify the browser that will be used to display help in the
|
|
|
|
'web' format. See linkgit:git-help[1].
|
|
|
|
|
|
|
|
help.format::
|
|
|
|
Override the default help format used by linkgit:git-help[1].
|
|
|
|
Values 'man', 'info', 'web' and 'html' are supported. 'man' is
|
|
|
|
the default. 'web' and 'html' are the same.
|
|
|
|
|
2008-08-31 13:54:58 +00:00
|
|
|
help.autocorrect::
|
|
|
|
Automatically correct and execute mistyped commands after
|
|
|
|
waiting for the given number of deciseconds (0.1 sec). If more
|
|
|
|
than one command can be deduced from the entered text, nothing
|
|
|
|
will be executed. If the value of this option is negative,
|
|
|
|
the corrected command will be executed immediately. If the
|
|
|
|
value is 0 - the command will be just shown but not executed.
|
|
|
|
This is the default.
|
|
|
|
|
2007-11-23 00:07:00 +00:00
|
|
|
http.proxy::
|
|
|
|
Override the HTTP proxy, normally configured using the 'http_proxy'
|
2007-12-29 06:20:38 +00:00
|
|
|
environment variable (see linkgit:curl[1]). This can be overridden
|
2007-12-03 21:48:54 +00:00
|
|
|
on a per-remote basis; see remote.<name>.proxy
|
2007-11-23 00:07:00 +00:00
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
http.sslVerify::
|
|
|
|
Whether to verify the SSL certificate when fetching or pushing
|
2006-06-07 12:56:45 +00:00
|
|
|
over HTTPS. Can be overridden by the 'GIT_SSL_NO_VERIFY' environment
|
2006-04-24 22:59:33 +00:00
|
|
|
variable.
|
|
|
|
|
|
|
|
http.sslCert::
|
|
|
|
File containing the SSL certificate when fetching or pushing
|
2006-06-07 12:56:45 +00:00
|
|
|
over HTTPS. Can be overridden by the 'GIT_SSL_CERT' environment
|
2006-04-24 22:59:33 +00:00
|
|
|
variable.
|
|
|
|
|
|
|
|
http.sslKey::
|
|
|
|
File containing the SSL private key when fetching or pushing
|
2006-06-03 20:27:26 +00:00
|
|
|
over HTTPS. Can be overridden by the 'GIT_SSL_KEY' environment
|
2006-04-24 22:59:33 +00:00
|
|
|
variable.
|
|
|
|
|
2009-05-28 03:16:03 +00:00
|
|
|
http.sslCertPasswordProtected::
|
|
|
|
Enable git's password prompt for the SSL certificate. Otherwise
|
|
|
|
OpenSSL will prompt the user, possibly many times, if the
|
|
|
|
certificate or private key is encrypted. Can be overridden by the
|
|
|
|
'GIT_SSL_CERT_PASSWORD_PROTECTED' environment variable.
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
http.sslCAInfo::
|
|
|
|
File containing the certificates to verify the peer with when
|
2006-06-03 20:27:26 +00:00
|
|
|
fetching or pushing over HTTPS. Can be overridden by the
|
2006-04-24 22:59:33 +00:00
|
|
|
'GIT_SSL_CAINFO' environment variable.
|
|
|
|
|
|
|
|
http.sslCAPath::
|
|
|
|
Path containing files with the CA certificates to verify the peer
|
2006-06-07 12:56:45 +00:00
|
|
|
with when fetching or pushing over HTTPS. Can be overridden
|
2006-04-24 22:59:33 +00:00
|
|
|
by the 'GIT_SSL_CAPATH' environment variable.
|
|
|
|
|
|
|
|
http.maxRequests::
|
2006-06-03 20:27:26 +00:00
|
|
|
How many HTTP requests to launch in parallel. Can be overridden
|
2006-04-24 22:59:33 +00:00
|
|
|
by the 'GIT_HTTP_MAX_REQUESTS' environment variable. Default is 5.
|
|
|
|
|
2009-11-27 15:42:26 +00:00
|
|
|
http.minSessions::
|
|
|
|
The number of curl sessions (counted across slots) to be kept across
|
|
|
|
requests. They will not be ended with curl_easy_cleanup() until
|
|
|
|
http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this
|
|
|
|
value will be capped at 1. Defaults to 1.
|
|
|
|
|
2009-10-31 00:47:41 +00:00
|
|
|
http.postBuffer::
|
|
|
|
Maximum size in bytes of the buffer used by smart HTTP
|
|
|
|
transports when POSTing data to the remote system.
|
|
|
|
For requests larger than this buffer size, HTTP/1.1 and
|
|
|
|
Transfer-Encoding: chunked is used to avoid creating a
|
|
|
|
massive pack file locally. Default is 1 MiB, which is
|
|
|
|
sufficient for most requests.
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
http.lowSpeedLimit, http.lowSpeedTime::
|
|
|
|
If the HTTP transfer speed is less than 'http.lowSpeedLimit'
|
|
|
|
for longer than 'http.lowSpeedTime' seconds, the transfer is aborted.
|
2006-06-03 20:27:26 +00:00
|
|
|
Can be overridden by the 'GIT_HTTP_LOW_SPEED_LIMIT' and
|
2006-04-24 22:59:33 +00:00
|
|
|
'GIT_HTTP_LOW_SPEED_TIME' environment variables.
|
|
|
|
|
2006-09-29 00:10:44 +00:00
|
|
|
http.noEPSV::
|
|
|
|
A boolean which disables using of EPSV ftp command by curl.
|
2007-04-13 16:02:33 +00:00
|
|
|
This can helpful with some "poor" ftp servers which don't
|
2006-09-29 00:10:44 +00:00
|
|
|
support EPSV mode. Can be overridden by the 'GIT_CURL_FTP_NO_EPSV'
|
|
|
|
environment variable. Default is false (curl will use EPSV).
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
i18n.commitEncoding::
|
|
|
|
Character encoding the commit messages are stored in; git itself
|
|
|
|
does not care per se, but this information is necessary e.g. when
|
|
|
|
importing commits from emails or in the gitk graphical history
|
|
|
|
browser (and possibly at other places in the future or in other
|
2007-12-29 06:20:38 +00:00
|
|
|
porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'.
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2006-12-28 00:41:33 +00:00
|
|
|
i18n.logOutputEncoding::
|
|
|
|
Character encoding the commit messages are converted to when
|
2010-01-09 23:33:00 +00:00
|
|
|
running 'git log' and friends.
|
2006-12-28 00:41:33 +00:00
|
|
|
|
2008-11-26 08:26:50 +00:00
|
|
|
imap::
|
|
|
|
The configuration variables in the 'imap' section are described
|
|
|
|
in linkgit:git-imap-send[1].
|
|
|
|
|
2010-02-16 23:44:46 +00:00
|
|
|
init.templatedir::
|
|
|
|
Specify the directory from which templates will be copied.
|
|
|
|
(See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].)
|
|
|
|
|
2008-01-08 03:55:14 +00:00
|
|
|
instaweb.browser::
|
|
|
|
Specify the program that will be used to browse your working
|
|
|
|
repository in gitweb. See linkgit:git-instaweb[1].
|
|
|
|
|
|
|
|
instaweb.httpd::
|
|
|
|
The HTTP daemon command-line to start gitweb on your working
|
|
|
|
repository. See linkgit:git-instaweb[1].
|
|
|
|
|
|
|
|
instaweb.local::
|
|
|
|
If true the web server started by linkgit:git-instaweb[1] will
|
|
|
|
be bound to the local IP (127.0.0.1).
|
|
|
|
|
|
|
|
instaweb.modulepath::
|
|
|
|
The module path for an apache httpd used by linkgit:git-instaweb[1].
|
|
|
|
|
|
|
|
instaweb.port::
|
|
|
|
The port number to bind the gitweb httpd to. See
|
|
|
|
linkgit:git-instaweb[1].
|
|
|
|
|
2009-02-05 08:28:26 +00:00
|
|
|
interactive.singlekey::
|
2009-08-07 14:24:21 +00:00
|
|
|
In interactive commands, allow the user to provide one-letter
|
2009-02-05 08:28:26 +00:00
|
|
|
input with a single key (i.e., without hitting enter).
|
|
|
|
Currently this is used only by the `\--patch` mode of
|
|
|
|
linkgit:git-add[1]. Note that this setting is silently
|
|
|
|
ignored if portable keystroke input is not available.
|
|
|
|
|
2008-05-22 15:24:07 +00:00
|
|
|
log.date::
|
|
|
|
Set default date-time mode for the log command. Setting log.date
|
2010-01-09 23:33:00 +00:00
|
|
|
value is similar to using 'git log'\'s --date option. The value is one of the
|
2008-05-22 15:24:07 +00:00
|
|
|
following alternatives: {relative,local,default,iso,rfc,short}.
|
|
|
|
See linkgit:git-log[1].
|
|
|
|
|
2010-02-16 23:39:52 +00:00
|
|
|
log.decorate::
|
|
|
|
Print out the ref names of any commits that are shown by the log
|
|
|
|
command. If 'short' is specified, the ref name prefixes 'refs/heads/',
|
|
|
|
'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is
|
|
|
|
specified, the full ref name (including prefix) will be printed.
|
|
|
|
This is the same as the log commands '--decorate' option.
|
|
|
|
|
2006-11-23 09:36:33 +00:00
|
|
|
log.showroot::
|
|
|
|
If true, the initial commit will be shown as a big creation event.
|
|
|
|
This is equivalent to a diff against an empty tree.
|
2007-12-29 06:20:38 +00:00
|
|
|
Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which
|
2006-11-23 09:36:33 +00:00
|
|
|
normally hide the root commit will now show it. True by default.
|
|
|
|
|
2009-02-08 14:34:27 +00:00
|
|
|
mailmap.file::
|
|
|
|
The location of an augmenting mailmap file. The default
|
|
|
|
mailmap, located in the root of the repository, is loaded
|
|
|
|
first, then the mailmap file pointed to by this variable.
|
|
|
|
The location of the mailmap file may be in a repository
|
|
|
|
subdirectory, or somewhere outside of the repository itself.
|
|
|
|
See linkgit:git-shortlog[1] and linkgit:git-blame[1].
|
|
|
|
|
2008-03-07 07:46:55 +00:00
|
|
|
man.viewer::
|
2008-03-13 05:48:46 +00:00
|
|
|
Specify the programs that may be used to display help in the
|
2008-03-07 07:46:55 +00:00
|
|
|
'man' format. See linkgit:git-help[1].
|
|
|
|
|
2008-04-25 06:25:35 +00:00
|
|
|
man.<tool>.cmd::
|
|
|
|
Specify the command to invoke the specified man viewer. The
|
|
|
|
specified command is evaluated in shell with the man page
|
|
|
|
passed as argument. (See linkgit:git-help[1].)
|
|
|
|
|
2008-04-25 06:24:41 +00:00
|
|
|
man.<tool>.path::
|
|
|
|
Override the path for the given tool that may be used to
|
|
|
|
display help in the 'man' format. See linkgit:git-help[1].
|
|
|
|
|
2008-11-26 08:26:50 +00:00
|
|
|
include::merge-config.txt[]
|
2008-08-29 17:49:56 +00:00
|
|
|
|
2007-12-17 12:21:22 +00:00
|
|
|
mergetool.<tool>.path::
|
|
|
|
Override the path for the given tool. This is useful in case
|
|
|
|
your tool is not in the PATH.
|
|
|
|
|
2008-02-21 23:31:12 +00:00
|
|
|
mergetool.<tool>.cmd::
|
|
|
|
Specify the command to invoke the specified merge tool. The
|
|
|
|
specified command is evaluated in shell with the following
|
|
|
|
variables available: 'BASE' is the name of a temporary file
|
|
|
|
containing the common base of the files to be merged, if available;
|
|
|
|
'LOCAL' is the name of a temporary file containing the contents of
|
|
|
|
the file on the current branch; 'REMOTE' is the name of a temporary
|
|
|
|
file containing the contents of the file from the branch being
|
|
|
|
merged; 'MERGED' contains the name of the file to which the merge
|
|
|
|
tool should write the results of a successful merge.
|
|
|
|
|
|
|
|
mergetool.<tool>.trustExitCode::
|
|
|
|
For a custom merge command, specify whether the exit code of
|
|
|
|
the merge command can be used to determine whether the merge was
|
|
|
|
successful. If this is not set to true then the merge target file
|
|
|
|
timestamp is checked and the merge assumed to have been successful
|
|
|
|
if the file has been updated, otherwise the user is prompted to
|
|
|
|
indicate the success of the merge.
|
|
|
|
|
2008-02-21 23:30:02 +00:00
|
|
|
mergetool.keepBackup::
|
|
|
|
After performing a merge, the original file with conflict markers
|
|
|
|
can be saved as a file with a `.orig` extension. If this variable
|
|
|
|
is set to `false` then this file is not preserved. Defaults to
|
|
|
|
`true` (i.e. keep the backup files).
|
|
|
|
|
2008-12-12 21:48:41 +00:00
|
|
|
mergetool.keepTemporaries::
|
|
|
|
When invoking a custom merge tool, git uses a set of temporary
|
|
|
|
files to pass to the tool. If the tool returns an error and this
|
|
|
|
variable is set to `true`, then these temporary files will be
|
|
|
|
preserved, otherwise they will be removed after the tool has
|
|
|
|
exited. Defaults to `false`.
|
|
|
|
|
2008-11-13 12:41:14 +00:00
|
|
|
mergetool.prompt::
|
|
|
|
Prompt before each invocation of the merge resolution program.
|
|
|
|
|
2010-03-12 17:04:26 +00:00
|
|
|
notes.displayRef::
|
|
|
|
The (fully qualified) refname from which to show notes when
|
|
|
|
showing commit messages. The value of this variable can be set
|
|
|
|
to a glob, in which case notes from all matching refs will be
|
|
|
|
shown. You may also specify this configuration variable
|
|
|
|
several times. A warning will be issued for refs that do not
|
|
|
|
exist, but a glob that does not match any refs is silently
|
|
|
|
ignored.
|
|
|
|
+
|
|
|
|
This setting can be overridden with the `GIT_NOTES_DISPLAY_REF`
|
|
|
|
environment variable, which must be a colon separated list of refs or
|
|
|
|
globs.
|
|
|
|
+
|
|
|
|
The effective value of "core.notesRef" (possibly overridden by
|
|
|
|
GIT_NOTES_REF) is also implicitly added to the list of refs to be
|
|
|
|
displayed.
|
|
|
|
|
2010-03-12 17:04:32 +00:00
|
|
|
notes.rewrite.<command>::
|
|
|
|
When rewriting commits with <command> (currently `amend` or
|
|
|
|
`rebase`) and this variable is set to `true`, git
|
|
|
|
automatically copies your notes from the original to the
|
|
|
|
rewritten commit. Defaults to `true`, but see
|
|
|
|
"notes.rewriteRef" below.
|
|
|
|
|
|
|
|
notes.rewriteMode::
|
|
|
|
When copying notes during a rewrite (see the
|
|
|
|
"notes.rewrite.<command>" option), determines what to do if
|
|
|
|
the target commit already has a note. Must be one of
|
|
|
|
`overwrite`, `concatenate`, or `ignore`. Defaults to
|
|
|
|
`concatenate`.
|
|
|
|
+
|
|
|
|
This setting can be overridden with the `GIT_NOTES_REWRITE_MODE`
|
|
|
|
environment variable.
|
|
|
|
|
|
|
|
notes.rewriteRef::
|
|
|
|
When copying notes during a rewrite, specifies the (fully
|
|
|
|
qualified) ref whose notes should be copied. The ref may be a
|
|
|
|
glob, in which case notes in all matching refs will be copied.
|
|
|
|
You may also specify this configuration several times.
|
|
|
|
+
|
|
|
|
Does not have a default value; you must configure this variable to
|
|
|
|
enable note rewriting.
|
2010-05-05 14:16:25 +00:00
|
|
|
+
|
|
|
|
This setting can be overridden with the `GIT_NOTES_REWRITE_REF`
|
|
|
|
environment variable, which must be a colon separated list of refs or
|
|
|
|
globs.
|
2010-03-12 17:04:32 +00:00
|
|
|
|
2006-07-23 05:50:30 +00:00
|
|
|
pack.window::
|
2007-12-29 06:20:38 +00:00
|
|
|
The size of the window used by linkgit:git-pack-objects[1] when no
|
2006-07-23 05:50:30 +00:00
|
|
|
window size is given on the command line. Defaults to 10.
|
|
|
|
|
2007-05-08 13:28:26 +00:00
|
|
|
pack.depth::
|
2007-12-29 06:20:38 +00:00
|
|
|
The maximum delta depth used by linkgit:git-pack-objects[1] when no
|
2007-05-08 13:28:26 +00:00
|
|
|
maximum depth is given on the command line. Defaults to 50.
|
2007-05-08 13:28:26 +00:00
|
|
|
|
2007-07-12 12:55:52 +00:00
|
|
|
pack.windowMemory::
|
2007-12-29 06:20:38 +00:00
|
|
|
The window memory size limit used by linkgit:git-pack-objects[1]
|
2007-07-12 12:55:52 +00:00
|
|
|
when no limit is given on the command line. The value can be
|
|
|
|
suffixed with "k", "m", or "g". Defaults to 0, meaning no
|
|
|
|
limit.
|
|
|
|
|
Custom compression levels for objects and packs
Add config variables pack.compression and core.loosecompression ,
and switch --compression=level to pack-objects.
Loose objects will be compressed using core.loosecompression if set,
else core.compression if set, else Z_BEST_SPEED.
Packed objects will be compressed using --compression=level if seen,
else pack.compression if set, else core.compression if set,
else Z_DEFAULT_COMPRESSION. This is the "pack compression level".
Loose objects added to a pack undeltified will be recompressed
to the pack compression level if it is unequal to the current
loose compression level by the preceding rules, or if the loose
object was written while core.legacyheaders = true. Newly
deltified loose objects are always compressed to the current
pack compression level.
Previously packed objects added to a pack are recompressed
to the current pack compression level exactly when their
deltification status changes, since the previous pack data
cannot be reused.
In either case, the --no-reuse-object switch from the first
patch below will always force recompression to the current pack
compression level, instead of assuming the pack compression level
hasn't changed and pack data can be reused when possible.
This applies on top of the following patches from Nicolas Pitre:
[PATCH] allow for undeltified objects not to be reused
[PATCH] make "repack -f" imply "pack-objects --no-reuse-object"
Signed-off-by: Dana L. How <danahow@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-09 20:56:50 +00:00
|
|
|
pack.compression::
|
|
|
|
An integer -1..9, indicating the compression level for objects
|
|
|
|
in a pack file. -1 is the zlib default. 0 means no
|
|
|
|
compression, and 1..9 are various speed/size tradeoffs, 9 being
|
|
|
|
slowest. If not set, defaults to core.compression. If that is
|
2007-11-19 16:58:51 +00:00
|
|
|
not set, defaults to -1, the zlib default, which is "a default
|
|
|
|
compromise between speed and compression (currently equivalent
|
|
|
|
to level 6)."
|
Custom compression levels for objects and packs
Add config variables pack.compression and core.loosecompression ,
and switch --compression=level to pack-objects.
Loose objects will be compressed using core.loosecompression if set,
else core.compression if set, else Z_BEST_SPEED.
Packed objects will be compressed using --compression=level if seen,
else pack.compression if set, else core.compression if set,
else Z_DEFAULT_COMPRESSION. This is the "pack compression level".
Loose objects added to a pack undeltified will be recompressed
to the pack compression level if it is unequal to the current
loose compression level by the preceding rules, or if the loose
object was written while core.legacyheaders = true. Newly
deltified loose objects are always compressed to the current
pack compression level.
Previously packed objects added to a pack are recompressed
to the current pack compression level exactly when their
deltification status changes, since the previous pack data
cannot be reused.
In either case, the --no-reuse-object switch from the first
patch below will always force recompression to the current pack
compression level, instead of assuming the pack compression level
hasn't changed and pack data can be reused when possible.
This applies on top of the following patches from Nicolas Pitre:
[PATCH] allow for undeltified objects not to be reused
[PATCH] make "repack -f" imply "pack-objects --no-reuse-object"
Signed-off-by: Dana L. How <danahow@gmail.com>
Signed-off-by: Junio C Hamano <junkio@cox.net>
2007-05-09 20:56:50 +00:00
|
|
|
|
2007-05-28 21:20:58 +00:00
|
|
|
pack.deltaCacheSize::
|
2007-08-24 00:44:13 +00:00
|
|
|
The maximum memory in bytes used for caching deltas in
|
2009-08-05 20:55:07 +00:00
|
|
|
linkgit:git-pack-objects[1] before writing them out to a pack.
|
|
|
|
This cache is used to speed up the writing object phase by not
|
|
|
|
having to recompute the final delta result once the best match
|
|
|
|
for all objects is found. Repacking large repositories on machines
|
|
|
|
which are tight with memory might be badly impacted by this though,
|
|
|
|
especially if this cache pushes the system into swapping.
|
|
|
|
A value of 0 means no limit. The smallest size of 1 byte may be
|
|
|
|
used to virtually disable this cache. Defaults to 256 MiB.
|
2007-05-28 21:20:58 +00:00
|
|
|
|
2007-05-28 21:20:59 +00:00
|
|
|
pack.deltaCacheLimit::
|
2007-09-10 15:51:34 +00:00
|
|
|
The maximum size of a delta, that is cached in
|
2009-08-05 20:55:07 +00:00
|
|
|
linkgit:git-pack-objects[1]. This cache is used to speed up the
|
|
|
|
writing object phase by not having to recompute the final delta
|
|
|
|
result once the best match for all objects is found. Defaults to 1000.
|
2007-05-28 21:20:59 +00:00
|
|
|
|
2007-09-10 15:51:34 +00:00
|
|
|
pack.threads::
|
|
|
|
Specifies the number of threads to spawn when searching for best
|
2007-12-29 06:20:38 +00:00
|
|
|
delta matches. This requires that linkgit:git-pack-objects[1]
|
2007-09-10 15:51:34 +00:00
|
|
|
be compiled with pthreads otherwise this option is ignored with a
|
|
|
|
warning. This is meant to reduce packing time on multiprocessor
|
|
|
|
machines. The required amount of memory for the delta search window
|
|
|
|
is however multiplied by the number of threads.
|
2008-02-23 02:11:56 +00:00
|
|
|
Specifying 0 will cause git to auto-detect the number of CPU's
|
|
|
|
and set the number of threads accordingly.
|
2007-09-10 15:51:34 +00:00
|
|
|
|
2007-11-02 03:26:04 +00:00
|
|
|
pack.indexVersion::
|
|
|
|
Specify the default pack index version. Valid values are 1 for
|
|
|
|
legacy pack index used by Git versions prior to 1.5.2, and 2 for
|
|
|
|
the new pack index with capabilities for packs larger than 4 GB
|
|
|
|
as well as proper protection against the repacking of corrupted
|
2008-06-25 04:25:53 +00:00
|
|
|
packs. Version 2 is the default. Note that version 2 is enforced
|
|
|
|
and this config option ignored whenever the corresponding pack is
|
|
|
|
larger than 2 GB.
|
|
|
|
+
|
|
|
|
If you have an old git that does not understand the version 2 `{asterisk}.idx` file,
|
|
|
|
cloning or fetching over a non native protocol (e.g. "http" and "rsync")
|
|
|
|
that will copy both `{asterisk}.pack` file and corresponding `{asterisk}.idx` file from the
|
|
|
|
other side may give you a repository that cannot be accessed with your
|
|
|
|
older version of git. If the `{asterisk}.pack` file is smaller than 2 GB, however,
|
|
|
|
you can use linkgit:git-index-pack[1] on the *.pack file to regenerate
|
|
|
|
the `{asterisk}.idx` file.
|
2007-11-02 03:26:04 +00:00
|
|
|
|
2008-03-13 06:11:15 +00:00
|
|
|
pack.packSizeLimit::
|
2010-02-04 03:48:28 +00:00
|
|
|
The maximum size of a pack. This setting only affects
|
|
|
|
packing to a file when repacking, i.e. the git:// protocol
|
|
|
|
is unaffected. It can be overridden by the `\--max-pack-size`
|
|
|
|
option of linkgit:git-repack[1]. The minimum size allowed is
|
|
|
|
limited to 1 MiB. The default is unlimited.
|
|
|
|
Common unit suffixes of 'k', 'm', or 'g' are
|
|
|
|
supported.
|
2008-02-05 14:25:04 +00:00
|
|
|
|
2008-08-16 02:14:33 +00:00
|
|
|
pager.<cmd>::
|
2008-08-24 05:38:06 +00:00
|
|
|
Allows turning on or off pagination of the output of a
|
|
|
|
particular git subcommand when writing to a tty. If
|
|
|
|
`\--paginate` or `\--no-pager` is specified on the command line,
|
|
|
|
it takes precedence over this option. To disable pagination for
|
2009-03-15 11:30:52 +00:00
|
|
|
all commands, set `core.pager` or `GIT_PAGER` to `cat`.
|
2008-08-16 02:14:33 +00:00
|
|
|
|
2010-05-02 11:00:44 +00:00
|
|
|
pretty.<name>::
|
|
|
|
Alias for a --pretty= format string, as specified in
|
|
|
|
linkgit:git-log[1]. Any aliases defined here can be used just
|
|
|
|
as the built-in pretty formats could. For example,
|
|
|
|
running `git config pretty.changelog "format:{asterisk} %H %s"`
|
|
|
|
would cause the invocation `git log --pretty=changelog`
|
|
|
|
to be equivalent to running `git log "--pretty=format:{asterisk} %H %s"`.
|
|
|
|
Note that an alias with the same name as a built-in format
|
|
|
|
will be silently ignored.
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
pull.octopus::
|
|
|
|
The default merge strategy to use when pulling multiple branches
|
|
|
|
at once.
|
|
|
|
|
|
|
|
pull.twohead::
|
|
|
|
The default merge strategy to use when pulling a single branch.
|
|
|
|
|
2009-03-16 15:42:51 +00:00
|
|
|
push.default::
|
|
|
|
Defines the action git push should take if no refspec is given
|
|
|
|
on the command line, no refspec is configured in the remote, and
|
|
|
|
no refspec is implied by any of the options given on the command
|
2009-03-30 10:11:41 +00:00
|
|
|
line. Possible values are:
|
2009-03-16 15:42:51 +00:00
|
|
|
+
|
|
|
|
* `nothing` do not push anything.
|
2009-03-30 10:11:41 +00:00
|
|
|
* `matching` push all matching branches.
|
2009-03-16 15:42:51 +00:00
|
|
|
All branches having the same name in both ends are considered to be
|
2009-03-30 10:11:41 +00:00
|
|
|
matching. This is the default.
|
2009-04-06 23:24:30 +00:00
|
|
|
* `tracking` push the current branch to its upstream branch.
|
2009-03-30 10:11:41 +00:00
|
|
|
* `current` push the current branch to a branch of the same name.
|
2009-03-16 15:42:51 +00:00
|
|
|
|
2009-03-01 22:11:38 +00:00
|
|
|
rebase.stat::
|
|
|
|
Whether to show a diffstat of what changed upstream since the last
|
|
|
|
rebase. False by default.
|
|
|
|
|
2009-10-20 21:56:40 +00:00
|
|
|
receive.autogc::
|
|
|
|
By default, git-receive-pack will run "git-gc --auto" after
|
|
|
|
receiving data from git-push and updating refs. You can stop
|
|
|
|
it by setting this variable to false.
|
|
|
|
|
2008-11-26 08:26:50 +00:00
|
|
|
receive.fsckObjects::
|
|
|
|
If it is set to true, git-receive-pack will check all received
|
|
|
|
objects. It will abort in the case of a malformed object or a
|
|
|
|
broken link. The result of an abort are only dangling objects.
|
|
|
|
Defaults to false.
|
|
|
|
|
|
|
|
receive.unpackLimit::
|
|
|
|
If the number of objects received in a push is below this
|
|
|
|
limit then the objects will be unpacked into loose object
|
|
|
|
files. However if the number of received objects equals or
|
|
|
|
exceeds this limit then the received pack will be stored as
|
|
|
|
a pack, after adding any missing delta bases. Storing the
|
|
|
|
pack from a push can make the push operation complete faster,
|
|
|
|
especially on slow filesystems. If not set, the value of
|
|
|
|
`transfer.unpackLimit` is used instead.
|
|
|
|
|
2008-11-26 19:11:18 +00:00
|
|
|
receive.denyDeletes::
|
|
|
|
If set to true, git-receive-pack will deny a ref update that deletes
|
|
|
|
the ref. Use this to prevent such a ref deletion via a push.
|
|
|
|
|
2010-07-24 16:07:53 +00:00
|
|
|
receive.denyDeleteCurrent::
|
|
|
|
If set to true, git-receive-pack will deny a ref update that
|
|
|
|
deletes the currently checked out branch of a non-bare repository.
|
|
|
|
|
2008-11-26 19:11:18 +00:00
|
|
|
receive.denyCurrentBranch::
|
2010-05-13 12:51:38 +00:00
|
|
|
If set to true or "refuse", git-receive-pack will deny a ref update
|
2008-11-26 19:11:18 +00:00
|
|
|
to the currently checked out branch of a non-bare repository.
|
|
|
|
Such a push is potentially dangerous because it brings the HEAD
|
|
|
|
out of sync with the index and working tree. If set to "warn",
|
|
|
|
print a warning of such a push to stderr, but allow the push to
|
|
|
|
proceed. If set to false or "ignore", allow such pushes with no
|
2010-03-17 11:14:57 +00:00
|
|
|
message. Defaults to "refuse".
|
2008-11-26 19:11:18 +00:00
|
|
|
|
2008-11-26 08:26:50 +00:00
|
|
|
receive.denyNonFastForwards::
|
|
|
|
If set to true, git-receive-pack will deny a ref update which is
|
2009-10-24 08:31:32 +00:00
|
|
|
not a fast-forward. Use this to prevent such an update via a push,
|
2008-11-26 08:26:50 +00:00
|
|
|
even if that push is forced. This configuration variable is
|
|
|
|
set when initializing a shared repository.
|
|
|
|
|
2009-10-20 21:56:40 +00:00
|
|
|
receive.updateserverinfo::
|
|
|
|
If set to true, git-receive-pack will run git-update-server-info
|
|
|
|
after receiving data from git-push and updating refs.
|
|
|
|
|
2006-10-23 16:42:14 +00:00
|
|
|
remote.<name>.url::
|
2007-12-29 06:20:38 +00:00
|
|
|
The URL of a remote repository. See linkgit:git-fetch[1] or
|
|
|
|
linkgit:git-push[1].
|
2006-10-23 16:42:14 +00:00
|
|
|
|
2009-06-09 16:01:34 +00:00
|
|
|
remote.<name>.pushurl::
|
|
|
|
The push URL of a remote repository. See linkgit:git-push[1].
|
|
|
|
|
2007-12-03 21:48:54 +00:00
|
|
|
remote.<name>.proxy::
|
|
|
|
For remotes that require curl (http, https and ftp), the URL to
|
|
|
|
the proxy to use for that remote. Set to the empty string to
|
|
|
|
disable proxying for that remote.
|
|
|
|
|
2006-10-23 16:42:14 +00:00
|
|
|
remote.<name>.fetch::
|
2007-12-29 06:20:38 +00:00
|
|
|
The default set of "refspec" for linkgit:git-fetch[1]. See
|
|
|
|
linkgit:git-fetch[1].
|
2006-10-23 16:42:14 +00:00
|
|
|
|
|
|
|
remote.<name>.push::
|
2007-12-29 06:20:38 +00:00
|
|
|
The default set of "refspec" for linkgit:git-push[1]. See
|
|
|
|
linkgit:git-push[1].
|
2006-10-23 16:42:14 +00:00
|
|
|
|
2008-04-17 11:17:20 +00:00
|
|
|
remote.<name>.mirror::
|
|
|
|
If true, pushing to this remote will automatically behave
|
|
|
|
as if the `\--mirror` option was given on the command line.
|
|
|
|
|
2007-02-20 20:13:43 +00:00
|
|
|
remote.<name>.skipDefaultUpdate::
|
|
|
|
If true, this remote will be skipped by default when updating
|
2009-11-09 20:11:06 +00:00
|
|
|
using linkgit:git-fetch[1] or the `update` subcommand of
|
|
|
|
linkgit:git-remote[1].
|
|
|
|
|
|
|
|
remote.<name>.skipFetchAll::
|
|
|
|
If true, this remote will be skipped by default when updating
|
|
|
|
using linkgit:git-fetch[1] or the `update` subcommand of
|
|
|
|
linkgit:git-remote[1].
|
2007-02-20 20:13:43 +00:00
|
|
|
|
2007-01-19 12:46:16 +00:00
|
|
|
remote.<name>.receivepack::
|
2007-01-25 04:45:39 +00:00
|
|
|
The default program to execute on the remote side when pushing. See
|
2008-03-06 20:28:07 +00:00
|
|
|
option \--receive-pack of linkgit:git-push[1].
|
2007-01-19 12:46:16 +00:00
|
|
|
|
2007-01-25 04:45:39 +00:00
|
|
|
remote.<name>.uploadpack::
|
|
|
|
The default program to execute on the remote side when fetching. See
|
2008-03-06 20:28:07 +00:00
|
|
|
option \--upload-pack of linkgit:git-fetch-pack[1].
|
2007-01-25 04:45:39 +00:00
|
|
|
|
2007-02-24 15:32:56 +00:00
|
|
|
remote.<name>.tagopt::
|
2008-03-06 20:28:07 +00:00
|
|
|
Setting this value to \--no-tags disables automatic tag following when
|
2010-04-19 23:31:25 +00:00
|
|
|
fetching from remote <name>. Setting it to \--tags will fetch every
|
|
|
|
tag from remote <name>, even if they are not reachable from remote
|
|
|
|
branch heads.
|
2007-02-24 15:32:56 +00:00
|
|
|
|
2009-11-18 01:42:25 +00:00
|
|
|
remote.<name>.vcs::
|
|
|
|
Setting this to a value <vcs> will cause git to interact with
|
|
|
|
the remote with the git-remote-<vcs> helper.
|
|
|
|
|
2007-02-20 20:13:43 +00:00
|
|
|
remotes.<group>::
|
|
|
|
The list of remotes which are fetched by "git remote update
|
2007-12-29 06:20:38 +00:00
|
|
|
<group>". See linkgit:git-remote[1].
|
2007-02-20 20:13:43 +00:00
|
|
|
|
2006-10-14 04:28:58 +00:00
|
|
|
repack.usedeltabaseoffset::
|
2008-06-25 04:24:53 +00:00
|
|
|
By default, linkgit:git-repack[1] creates packs that use
|
|
|
|
delta-base offset. If you need to share your repository with
|
|
|
|
git older than version 1.4.4, either directly or via a dumb
|
|
|
|
protocol such as http, then you need to set this option to
|
|
|
|
"false" and repack. Access from old git versions over the
|
|
|
|
native protocol are unaffected by this option.
|
2006-10-14 04:28:58 +00:00
|
|
|
|
2008-11-26 08:26:50 +00:00
|
|
|
rerere.autoupdate::
|
|
|
|
When set to true, `git-rerere` updates the index with the
|
|
|
|
resulting contents after it cleanly resolves conflicts using
|
|
|
|
previously recorded resolution. Defaults to false.
|
|
|
|
|
|
|
|
rerere.enabled::
|
|
|
|
Activate recording of resolved conflicts, so that identical
|
|
|
|
conflict hunks can be resolved automatically, should they
|
|
|
|
be encountered again. linkgit:git-rerere[1] command is by
|
|
|
|
default enabled if you create `rr-cache` directory under
|
|
|
|
`$GIT_DIR`, but can be disabled by setting this option to false.
|
|
|
|
|
2009-07-22 21:39:30 +00:00
|
|
|
sendemail.identity::
|
|
|
|
A configuration identity. When given, causes values in the
|
|
|
|
'sendemail.<identity>' subsection to take precedence over
|
|
|
|
values in the 'sendemail' section. The default identity is
|
|
|
|
the value of 'sendemail.identity'.
|
|
|
|
|
|
|
|
sendemail.smtpencryption::
|
|
|
|
See linkgit:git-send-email[1] for description. Note that this
|
|
|
|
setting is not subject to the 'identity' mechanism.
|
|
|
|
|
|
|
|
sendemail.smtpssl::
|
|
|
|
Deprecated alias for 'sendemail.smtpencryption = ssl'.
|
|
|
|
|
|
|
|
sendemail.<identity>.*::
|
|
|
|
Identity-specific versions of the 'sendemail.*' parameters
|
|
|
|
found below, taking precedence over those when the this
|
|
|
|
identity is selected, through command-line or
|
|
|
|
'sendemail.identity'.
|
|
|
|
|
|
|
|
sendemail.aliasesfile::
|
|
|
|
sendemail.aliasfiletype::
|
|
|
|
sendemail.bcc::
|
|
|
|
sendemail.cc::
|
|
|
|
sendemail.cccmd::
|
|
|
|
sendemail.chainreplyto::
|
|
|
|
sendemail.confirm::
|
|
|
|
sendemail.envelopesender::
|
|
|
|
sendemail.from::
|
|
|
|
sendemail.multiedit::
|
|
|
|
sendemail.signedoffbycc::
|
|
|
|
sendemail.smtppass::
|
|
|
|
sendemail.suppresscc::
|
|
|
|
sendemail.suppressfrom::
|
|
|
|
sendemail.to::
|
2010-04-10 14:53:56 +00:00
|
|
|
sendemail.smtpdomain::
|
2009-07-22 21:39:30 +00:00
|
|
|
sendemail.smtpserver::
|
|
|
|
sendemail.smtpserverport::
|
|
|
|
sendemail.smtpuser::
|
|
|
|
sendemail.thread::
|
|
|
|
sendemail.validate::
|
|
|
|
See linkgit:git-send-email[1] for description.
|
|
|
|
|
|
|
|
sendemail.signedoffcc::
|
|
|
|
Deprecated alias for 'sendemail.signedoffbycc'.
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
showbranch.default::
|
2007-12-29 06:20:38 +00:00
|
|
|
The default set of branches for linkgit:git-show-branch[1].
|
|
|
|
See linkgit:git-show-branch[1].
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2007-12-07 21:26:07 +00:00
|
|
|
status.relativePaths::
|
2007-12-29 06:20:38 +00:00
|
|
|
By default, linkgit:git-status[1] shows paths relative to the
|
2007-12-07 21:26:07 +00:00
|
|
|
current directory. Setting this variable to `false` shows paths
|
|
|
|
relative to the repository root (this was the default for git
|
|
|
|
prior to v1.5.4).
|
|
|
|
|
2008-06-05 12:47:50 +00:00
|
|
|
status.showUntrackedFiles::
|
|
|
|
By default, linkgit:git-status[1] and linkgit:git-commit[1] show
|
|
|
|
files which are not currently tracked by Git. Directories which
|
|
|
|
contain only untracked files, are shown with the directory name
|
|
|
|
only. Showing untracked files means that Git needs to lstat() all
|
|
|
|
all the files in the whole repository, which might be slow on some
|
|
|
|
systems. So, this variable controls how the commands displays
|
|
|
|
the untracked files. Possible values are:
|
|
|
|
+
|
|
|
|
--
|
|
|
|
- 'no' - Show no untracked files
|
|
|
|
- 'normal' - Shows untracked files and directories
|
|
|
|
- 'all' - Shows also individual files in untracked directories.
|
|
|
|
--
|
|
|
|
+
|
|
|
|
If this variable is not specified, it defaults to 'normal'.
|
|
|
|
This variable can be overridden with the -u|--untracked-files option
|
|
|
|
of linkgit:git-status[1] and linkgit:git-commit[1].
|
|
|
|
|
2010-05-20 15:55:42 +00:00
|
|
|
status.submodulesummary::
|
|
|
|
Defaults to false.
|
|
|
|
If this is set to a non zero number or true (identical to -1 or an
|
|
|
|
unlimited number), the submodule summary will be enabled and a
|
|
|
|
summary of commits for modified submodules will be shown (see
|
|
|
|
--summary-limit option of linkgit:git-submodule[1]).
|
|
|
|
|
2010-07-15 07:51:19 +00:00
|
|
|
submodule.<name>.path::
|
|
|
|
submodule.<name>.url::
|
|
|
|
submodule.<name>.update::
|
|
|
|
The path within this project, URL, and the updating strategy
|
|
|
|
for a submodule. These variables are initially populated
|
|
|
|
by 'git submodule init'; edit them to override the
|
|
|
|
URL and other values found in the `.gitmodules` file. See
|
|
|
|
linkgit:git-submodule[1] and linkgit:gitmodules[5] for details.
|
|
|
|
|
2006-07-20 09:30:44 +00:00
|
|
|
tar.umask::
|
2007-08-21 18:01:16 +00:00
|
|
|
This variable can be used to restrict the permission bits of
|
|
|
|
tar archive entries. The default is 0002, which turns off the
|
|
|
|
world write bit. The special value "user" indicates that the
|
|
|
|
archiving user's umask will be used instead. See umask(2) and
|
2007-12-29 06:20:38 +00:00
|
|
|
linkgit:git-archive[1].
|
2006-07-20 09:30:44 +00:00
|
|
|
|
2008-11-26 08:26:50 +00:00
|
|
|
transfer.unpackLimit::
|
|
|
|
When `fetch.unpackLimit` or `receive.unpackLimit` are
|
|
|
|
not set, the value of this variable is used instead.
|
|
|
|
The default value is 100.
|
|
|
|
|
2008-02-20 18:43:53 +00:00
|
|
|
url.<base>.insteadOf::
|
|
|
|
Any URL that starts with this value will be rewritten to
|
|
|
|
start, instead, with <base>. In cases where some site serves a
|
|
|
|
large number of repositories, and serves them with multiple
|
|
|
|
access methods, and some users need to use different access
|
|
|
|
methods, this feature allows people to specify any of the
|
|
|
|
equivalent URLs and have git automatically rewrite the URL to
|
|
|
|
the best alternative for the particular user, even for a
|
2008-02-25 06:25:04 +00:00
|
|
|
never-before-seen repository on the site. When more than one
|
|
|
|
insteadOf strings match a given URL, the longest match is used.
|
2008-02-20 18:43:53 +00:00
|
|
|
|
2009-09-07 08:56:33 +00:00
|
|
|
url.<base>.pushInsteadOf::
|
|
|
|
Any URL that starts with this value will not be pushed to;
|
|
|
|
instead, it will be rewritten to start with <base>, and the
|
|
|
|
resulting URL will be pushed to. In cases where some site serves
|
|
|
|
a large number of repositories, and serves them with multiple
|
|
|
|
access methods, some of which do not allow push, this feature
|
|
|
|
allows people to specify a pull-only URL and have git
|
|
|
|
automatically use an appropriate URL to push, even for a
|
|
|
|
never-before-seen repository on the site. When more than one
|
|
|
|
pushInsteadOf strings match a given URL, the longest match is
|
|
|
|
used. If a remote has an explicit pushurl, git will ignore this
|
|
|
|
setting for that remote.
|
|
|
|
|
2006-04-24 22:59:33 +00:00
|
|
|
user.email::
|
|
|
|
Your email address to be recorded in any newly created commits.
|
2007-04-29 01:40:28 +00:00
|
|
|
Can be overridden by the 'GIT_AUTHOR_EMAIL', 'GIT_COMMITTER_EMAIL', and
|
2007-12-29 06:20:38 +00:00
|
|
|
'EMAIL' environment variables. See linkgit:git-commit-tree[1].
|
2006-04-24 22:59:33 +00:00
|
|
|
|
|
|
|
user.name::
|
|
|
|
Your full name to be recorded in any newly created commits.
|
2006-06-03 20:27:26 +00:00
|
|
|
Can be overridden by the 'GIT_AUTHOR_NAME' and 'GIT_COMMITTER_NAME'
|
2007-12-29 06:20:38 +00:00
|
|
|
environment variables. See linkgit:git-commit-tree[1].
|
2006-04-24 22:59:33 +00:00
|
|
|
|
2007-01-26 14:13:46 +00:00
|
|
|
user.signingkey::
|
2007-12-29 06:20:38 +00:00
|
|
|
If linkgit:git-tag[1] is not selecting the key you want it to
|
2007-01-26 14:13:46 +00:00
|
|
|
automatically when creating a signed tag, you can override the
|
|
|
|
default selection with this variable. This option is passed
|
|
|
|
unchanged to gpg's --local-user parameter, so you may specify a key
|
|
|
|
using any method that gpg supports.
|
|
|
|
|
2008-01-08 03:55:14 +00:00
|
|
|
web.browser::
|
|
|
|
Specify a web browser that may be used by some commands.
|
|
|
|
Currently only linkgit:git-instaweb[1] and linkgit:git-help[1]
|
|
|
|
may use it.
|