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