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