]>
Commit | Line | Data |
---|---|---|
1ab661dd PB |
1 | CONFIGURATION FILE |
2 | ------------------ | |
3 | ||
2de9b711 TA |
4 | The Git configuration file contains a number of variables that affect |
5 | the Git commands' behavior. The `.git/config` file in each repository | |
66e35fcb SB |
6 | is used to store the configuration for that repository, and |
7 | `$HOME/.gitconfig` is used to store a per-user configuration as | |
773002a7 | 8 | fallback values for the `.git/config` file. The file `/etc/gitconfig` |
66e35fcb | 9 | can be used to store a system-wide default configuration. |
5ea5621f | 10 | |
2de9b711 | 11 | The configuration variables are used by both the Git plumbing |
b7ee2266 SB |
12 | and the porcelains. The variables are divided into sections, wherein |
13 | the fully qualified variable name of the variable itself is the last | |
1ab661dd | 14 | dot-separated segment and the section name is everything before the last |
e0a4aae8 LP |
15 | dot. The variable names are case-insensitive, allow only alphanumeric |
16 | characters and `-`, and must start with an alphabetic character. Some | |
a5285b6c JH |
17 | variables may appear multiple times; we say then that the variable is |
18 | multivalued. | |
1ab661dd | 19 | |
e136f33b JN |
20 | Syntax |
21 | ~~~~~~ | |
22 | ||
1ab661dd | 23 | The syntax is fairly flexible and permissive; whitespaces are mostly |
e136f33b JN |
24 | ignored. The '#' and ';' characters begin comments to the end of line, |
25 | blank lines are ignored. | |
26 | ||
27 | The file consists of sections and variables. A section begins with | |
28 | the name of the section in square brackets and continues until the next | |
05c3e5c7 | 29 | section begins. Section names are case-insensitive. Only alphanumeric |
dcb11263 | 30 | characters, `-` and `.` are allowed in section names. Each variable |
773002a7 SB |
31 | must belong to some section, which means that there must be a section |
32 | header before the first setting of a variable. | |
e136f33b JN |
33 | |
34 | Sections can be further divided into subsections. To begin a subsection | |
35 | put its name in double quotes, separated by space from the section name, | |
773002a7 | 36 | in the section header, like in the example below: |
e136f33b JN |
37 | |
38 | -------- | |
39 | [section "subsection"] | |
40 | ||
41 | -------- | |
42 | ||
b7ee2266 | 43 | Subsection names are case sensitive and can contain any characters except |
1feb0617 DB |
44 | newline and the null byte. Doublequote `"` and backslash can be included |
45 | by escaping them as `\"` and `\\`, respectively. Backslashes preceding | |
46 | other characters are dropped when reading; for example, `\t` is read as | |
47 | `t` and `\0` is read as `0` Section headers cannot span multiple lines. | |
48 | Variables may belong directly to a section or to a given subsection. You | |
49 | can have `[section]` if you have `[section "subsection"]`, but you don't | |
50 | need to. | |
e136f33b | 51 | |
f7376329 CMN |
52 | There is also a deprecated `[section.subsection]` syntax. With this |
53 | syntax, the subsection name is converted to lower-case and is also | |
54 | compared case sensitively. These subsection names follow the same | |
55 | restrictions as section names. | |
e136f33b | 56 | |
2ceb639f NS |
57 | All the other lines (and the remainder of the line after the section |
58 | header) are recognized as setting variables, in the form | |
1c448b3b JH |
59 | 'name = value' (or just 'name', which is a short-hand to say that |
60 | the variable is the boolean "true"). | |
e0a4aae8 | 61 | The variable names are case-insensitive, allow only alphanumeric characters |
a5285b6c | 62 | and `-`, and must start with an alphabetic character. |
e136f33b | 63 | |
ff5507ed JH |
64 | A line that defines a value can be continued to the next line by |
65 | ending it with a `\`; the backquote and the end-of-line are | |
66 | stripped. Leading whitespaces after 'name =', the remainder of the | |
67 | line after the first comment character '#' or ';', and trailing | |
68 | whitespaces of the line are discarded unless they are enclosed in | |
69 | double quotes. Internal whitespaces within the value are retained | |
70 | verbatim. | |
e136f33b | 71 | |
ff5507ed JH |
72 | Inside double quotes, double quote `"` and backslash `\` characters |
73 | must be escaped: use `\"` for `"` and `\\` for `\`. | |
e136f33b | 74 | |
dcb11263 CJ |
75 | The following escape sequences (beside `\"` and `\\`) are recognized: |
76 | `\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB) | |
a58088ab JL |
77 | and `\b` for backspace (BS). Other char escape sequences (including octal |
78 | escape sequences) are invalid. | |
e136f33b | 79 | |
1ab661dd | 80 | |
9b25a0b5 JK |
81 | Includes |
82 | ~~~~~~~~ | |
83 | ||
9d71d94d JK |
84 | The `include` and `includeIf` sections allow you to include config |
85 | directives from another source. These sections behave identically to | |
86 | each other with the exception that `includeIf` sections may be ignored | |
87 | if their condition does not evaluate to true; see "Conditional includes" | |
88 | below. | |
89 | ||
df0233be | 90 | You can include a config file from another by setting the special |
9d71d94d JK |
91 | `include.path` (or `includeIf.*.path`) variable to the name of the file |
92 | to be included. The variable takes a pathname as its value, and is | |
93 | subject to tilde expansion. These variables can be given multiple times. | |
dca83abd | 94 | |
a076df28 JK |
95 | The contents of the included file are inserted immediately, as if they |
96 | had been found at the location of the include directive. If the value of the | |
9d71d94d | 97 | variable is a relative path, the path is considered to |
1050e987 NTND |
98 | be relative to the configuration file in which the include directive |
99 | was found. See below for examples. | |
dca83abd | 100 | |
3efd0bed NTND |
101 | Conditional includes |
102 | ~~~~~~~~~~~~~~~~~~~~ | |
103 | ||
104 | You can include a config file from another conditionally by setting a | |
105 | `includeIf.<condition>.path` variable to the name of the file to be | |
9d71d94d | 106 | included. |
3efd0bed NTND |
107 | |
108 | The condition starts with a keyword followed by a colon and some data | |
109 | whose format and meaning depends on the keyword. Supported keywords | |
110 | are: | |
111 | ||
112 | `gitdir`:: | |
113 | ||
114 | The data that follows the keyword `gitdir:` is used as a glob | |
115 | pattern. If the location of the .git directory matches the | |
116 | pattern, the include condition is met. | |
117 | + | |
118 | The .git location may be auto-discovered, or come from `$GIT_DIR` | |
119 | environment variable. If the repository is auto discovered via a .git | |
120 | file (e.g. from submodules, or a linked worktree), the .git location | |
121 | would be the final location where the .git directory is, not where the | |
122 | .git file is. | |
123 | + | |
124 | The pattern can contain standard globbing wildcards and two additional | |
125 | ones, `**/` and `/**`, that can match multiple path components. Please | |
126 | refer to linkgit:gitignore[5] for details. For convenience: | |
127 | ||
128 | * If the pattern starts with `~/`, `~` will be substituted with the | |
129 | content of the environment variable `HOME`. | |
130 | ||
131 | * If the pattern starts with `./`, it is replaced with the directory | |
132 | containing the current config file. | |
133 | ||
134 | * If the pattern does not start with either `~/`, `./` or `/`, `**/` | |
135 | will be automatically prepended. For example, the pattern `foo/bar` | |
136 | becomes `**/foo/bar` and would match `/any/path/to/foo/bar`. | |
137 | ||
138 | * If the pattern ends with `/`, `**` will be automatically added. For | |
139 | example, the pattern `foo/` becomes `foo/**`. In other words, it | |
140 | matches "foo" and everything inside, recursively. | |
141 | ||
142 | `gitdir/i`:: | |
143 | This is the same as `gitdir` except that matching is done | |
144 | case-insensitively (e.g. on case-insensitive file sytems) | |
145 | ||
146 | A few more notes on matching via `gitdir` and `gitdir/i`: | |
147 | ||
148 | * Symlinks in `$GIT_DIR` are not resolved before matching. | |
149 | ||
0624c63c ÆAB |
150 | * Both the symlink & realpath versions of paths will be matched |
151 | outside of `$GIT_DIR`. E.g. if ~/git is a symlink to | |
152 | /mnt/storage/git, both `gitdir:~/git` and `gitdir:/mnt/storage/git` | |
153 | will match. | |
154 | + | |
155 | This was not the case in the initial release of this feature in | |
156 | v2.13.0, which only matched the realpath version. Configuration that | |
157 | wants to be compatible with the initial release of this feature needs | |
158 | to either specify only the realpath version, or both versions. | |
159 | ||
3efd0bed NTND |
160 | * Note that "../" is not special and will match literally, which is |
161 | unlikely what you want. | |
9b25a0b5 | 162 | |
1ab661dd PB |
163 | Example |
164 | ~~~~~~~ | |
165 | ||
166 | # Core variables | |
167 | [core] | |
168 | ; Don't trust file modes | |
169 | filemode = false | |
170 | ||
171 | # Our diff algorithm | |
172 | [diff] | |
6bb9e51b | 173 | external = /usr/local/bin/diff-wrapper |
1ab661dd PB |
174 | renames = true |
175 | ||
910c00c8 AK |
176 | [branch "devel"] |
177 | remote = origin | |
178 | merge = refs/heads/devel | |
179 | ||
e136f33b JN |
180 | # Proxy settings |
181 | [core] | |
29093c28 | 182 | gitProxy="ssh" for "kernel.org" |
e136f33b | 183 | gitProxy=default-proxy ; for the rest |
910c00c8 | 184 | |
9b25a0b5 JK |
185 | [include] |
186 | path = /path/to/foo.inc ; include by absolute path | |
ce933ebd JK |
187 | path = foo.inc ; find "foo.inc" relative to the current file |
188 | path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory | |
9b25a0b5 | 189 | |
3efd0bed NTND |
190 | ; include if $GIT_DIR is /path/to/foo/.git |
191 | [includeIf "gitdir:/path/to/foo/.git"] | |
192 | path = /path/to/foo.inc | |
193 | ||
194 | ; include for all repositories inside /path/to/group | |
195 | [includeIf "gitdir:/path/to/group/"] | |
196 | path = /path/to/foo.inc | |
197 | ||
198 | ; include for all repositories inside $HOME/to/group | |
199 | [includeIf "gitdir:~/to/group/"] | |
200 | path = /path/to/foo.inc | |
5f7b91ba | 201 | |
994cd6c7 JK |
202 | ; relative paths are always relative to the including |
203 | ; file (if the condition is true); their location is not | |
204 | ; affected by the condition | |
205 | [includeIf "gitdir:/path/to/group/"] | |
206 | path = foo.inc | |
207 | ||
5f7b91ba JH |
208 | Values |
209 | ~~~~~~ | |
210 | ||
211 | Values of many variables are treated as a simple string, but there | |
212 | are variables that take values of specific types and there are rules | |
213 | as to how to spell them. | |
214 | ||
215 | boolean:: | |
216 | ||
217 | When a variable is said to take a boolean value, many | |
218 | synonyms are accepted for 'true' and 'false'; these are all | |
219 | case-insensitive. | |
220 | ||
7f0a02be AH |
221 | true;; Boolean true literals are `yes`, `on`, `true`, |
222 | and `1`. Also, a variable defined without `= <value>` | |
5f7b91ba JH |
223 | is taken as true. |
224 | ||
7f0a02be AH |
225 | false;; Boolean false literals are `no`, `off`, `false`, |
226 | `0` and the empty string. | |
5f7b91ba | 227 | + |
ed3bb3df | 228 | When converting a value to its canonical form using the `--type=bool` type |
7f0a02be | 229 | specifier, 'git config' will ensure that the output is "true" or |
5f7b91ba JH |
230 | "false" (spelled in lowercase). |
231 | ||
232 | integer:: | |
233 | The value for many variables that specify various sizes can | |
234 | be suffixed with `k`, `M`,... to mean "scale the number by | |
235 | 1024", "by 1024x1024", etc. | |
236 | ||
b92c1a28 | 237 | color:: |
adb33566 JK |
238 | The value for a variable that takes a color is a list of |
239 | colors (at most two, one for foreground and one for background) | |
240 | and attributes (as many as you want), separated by spaces. | |
5f456b3c | 241 | + |
adb33566 JK |
242 | The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, |
243 | `blue`, `magenta`, `cyan` and `white`. The first color given is the | |
244 | foreground; the second is the background. | |
5ee87585 | 245 | + |
adb33566 JK |
246 | Colors may also be given as numbers between 0 and 255; these use ANSI |
247 | 256-color mode (but note that not all terminals may support this). If | |
248 | your terminal supports it, you may also specify 24-bit RGB values as | |
249 | hex, like `#ff0ab3`. | |
250 | + | |
9dc3515c JK |
251 | The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, |
252 | `italic`, and `strike` (for crossed-out or "strikethrough" letters). | |
253 | The position of any attributes with respect to the colors | |
54590a0e JK |
254 | (before, after, or in between), doesn't matter. Specific attributes may |
255 | be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, | |
256 | `no-ul`, etc). | |
adb33566 | 257 | + |
512aba26 JK |
258 | An empty color string produces no color effect at all. This can be used |
259 | to avoid coloring specific elements without disabling color entirely. | |
260 | + | |
adb33566 JK |
261 | For git's pre-defined color slots, the attributes are meant to be reset |
262 | at the beginning of each item in the colored output. So setting | |
263 | `color.decorate.branch` to `black` will paint that branch name in a | |
264 | plain `black`, even if the previous thing on the same output line (e.g. | |
265 | opening parenthesis before the list of branch names in `log --decorate` | |
266 | output) is set to be painted with `bold` or some other attribute. | |
267 | However, custom log formats may do more complicated and layered | |
268 | coloring, and the negated forms may be useful there. | |
b92c1a28 | 269 | |
dca83abd JH |
270 | pathname:: |
271 | A variable that takes a pathname value can be given a | |
272 | string that begins with "`~/`" or "`~user/`", and the usual | |
273 | tilde expansion happens to such a string: `~/` | |
274 | is expanded to the value of `$HOME`, and `~user/` to the | |
275 | specified user's home directory. | |
276 | ||
5f7b91ba | 277 | |
1ab661dd PB |
278 | Variables |
279 | ~~~~~~~~~ | |
280 | ||
281 | Note that this list is non-comprehensive and not necessarily complete. | |
b8936cf0 | 282 | For command-specific variables, you will find a more detailed description |
93728b23 CA |
283 | in the appropriate manual page. |
284 | ||
285 | Other git-related tools may and do use their own variables. When | |
286 | inventing new variables for use in your own tool, make sure their | |
287 | names do not conflict with those that are used by Git itself and | |
288 | other popular tools, and describe them in your documentation. | |
289 | ||
838ef420 | 290 | include::config/advice.txt[] |
75194438 | 291 | |
1a394fa9 | 292 | include::config/core.txt[] |
dce96489 | 293 | |
29120d8e | 294 | include::config/add.txt[] |
13bd2134 | 295 | |
f740c8f1 | 296 | include::config/alias.txt[] |
dfd42a3c | 297 | |
d293ffef | 298 | include::config/am.txt[] |
e97a5e76 | 299 | |
696d4796 | 300 | include::config/apply.txt[] |
1ab661dd | 301 | |
d09467b6 | 302 | include::config/blame.txt[] |
8578037b | 303 | |
7273b95d | 304 | include::config/branch.txt[] |
a5ba2cbe | 305 | |
6b0b9740 | 306 | include::config/browser.txt[] |
584627b4 | 307 | |
9140b410 | 308 | include::config/checkout.txt[] |
fa655d84 | 309 | |
328e629c | 310 | include::config/clean.txt[] |
2122591b | 311 | |
0a7839e3 | 312 | include::config/color.txt[] |
6b2f2d98 | 313 | |
dbfc949f | 314 | include::config/column.txt[] |
d96e3c15 | 315 | |
5453d236 | 316 | include::config/commit.txt[] |
aaab8420 | 317 | |
3a49be6d | 318 | include::config/credential.txt[] |
7f4d4746 | 319 | |
2b4b7305 | 320 | include::config/completion.txt[] |
6532f374 | 321 | |
fa922d74 | 322 | include::config/diff.txt[] |
afcbc8e7 | 323 | |
9155f6f6 | 324 | include::config/difftool.txt[] |
a904392e | 325 | |
f2e58246 | 326 | include::config/fastimport.txt[] |
d9545c7f | 327 | |
561fda20 | 328 | include::config/fetch.txt[] |
42cc7485 | 329 | |
ab14f494 | 330 | include::config/format.txt[] |
bb52995f | 331 | |
734dfebb | 332 | include::config/filter.txt[] |
26488f59 | 333 | |
f80ccccb | 334 | include::config/fsck.txt[] |
1335f732 | 335 | |
8daf3271 | 336 | include::config/gc.txt[] |
48c32424 | 337 | |
996f66eb | 338 | include::config/gitcvs.txt[] |
04752868 | 339 | |
0648b769 | 340 | include::config/gitweb.txt[] |
cd82323f | 341 | |
434e6e75 | 342 | include::config/grep.txt[] |
ecd9ba61 | 343 | |
ea555d04 | 344 | include::config/gpg.txt[] |
b02f51b1 | 345 | |
d864cf8b | 346 | include::config/gui.txt[] |
a2df1fb2 | 347 | |
2c31a830 | 348 | include::config/guitool.txt[] |
390c3480 | 349 | |
d3df4270 | 350 | include::config/help.txt[] |
b1f809d0 | 351 | |
ad308479 | 352 | include::config/http.txt[] |
6a56993b | 353 | |
8fc3f75f | 354 | include::config/i18n.txt[] |
d2c11a38 | 355 | |
ae461026 | 356 | include::config/imap.txt[] |
b0f34c3d | 357 | |
c1b342ad | 358 | include::config/index.txt[] |
3c09d684 | 359 | |
ec335607 | 360 | include::config/init.txt[] |
d8a8488d | 361 | |
983a9eeb CC |
362 | instaweb.browser:: |
363 | Specify the program that will be used to browse your working | |
364 | repository in gitweb. See linkgit:git-instaweb[1]. | |
365 | ||
366 | instaweb.httpd:: | |
367 | The HTTP daemon command-line to start gitweb on your working | |
368 | repository. See linkgit:git-instaweb[1]. | |
369 | ||
370 | instaweb.local:: | |
371 | If true the web server started by linkgit:git-instaweb[1] will | |
372 | be bound to the local IP (127.0.0.1). | |
373 | ||
da0005b8 | 374 | instaweb.modulePath:: |
6b677a28 VS |
375 | The default module path for linkgit:git-instaweb[1] to use |
376 | instead of /usr/lib/apache2/modules. Only used if httpd | |
377 | is Apache. | |
983a9eeb CC |
378 | |
379 | instaweb.port:: | |
380 | The port number to bind the gitweb httpd to. See | |
381 | linkgit:git-instaweb[1]. | |
382 | ||
da0005b8 | 383 | interactive.singleKey:: |
57f6ec02 | 384 | In interactive commands, allow the user to provide one-letter |
ca6ac7f1 | 385 | input with a single key (i.e., without hitting enter). |
6cf378f0 | 386 | Currently this is used by the `--patch` mode of |
e6b57a8a CI |
387 | linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1], |
388 | linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this | |
389 | setting is silently ignored if portable keystroke input | |
8358f1ac | 390 | is not available; requires the Perl module Term::ReadKey. |
ca6ac7f1 | 391 | |
01143847 JK |
392 | interactive.diffFilter:: |
393 | When an interactive command (such as `git add --patch`) shows | |
394 | a colorized diff, git will pipe the diff through the shell | |
395 | command defined by this configuration variable. The command may | |
396 | mark up the diff further for human consumption, provided that it | |
397 | retains a one-to-one correspondence with the lines in the | |
398 | original diff. Defaults to disabled (no filtering). | |
399 | ||
0c47695a JS |
400 | log.abbrevCommit:: |
401 | If true, makes linkgit:git-log[1], linkgit:git-show[1], and | |
6cf378f0 JK |
402 | linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may |
403 | override this option with `--no-abbrev-commit`. | |
0c47695a | 404 | |
dd0ffd5b | 405 | log.date:: |
e860795d JN |
406 | Set the default date-time mode for the 'log' command. |
407 | Setting a value for log.date is similar to using 'git log''s | |
78a84416 | 408 | `--date` option. See linkgit:git-log[1] for details. |
dd0ffd5b | 409 | |
eb734454 SD |
410 | log.decorate:: |
411 | Print out the ref names of any commits that are shown by the log | |
412 | command. If 'short' is specified, the ref name prefixes 'refs/heads/', | |
413 | 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is | |
414 | specified, the full ref name (including prefix) will be printed. | |
462cbb41 RJ |
415 | If 'auto' is specified, then if the output is going to a terminal, |
416 | the ref names are shown as if 'short' were given, otherwise no ref | |
ce18123c | 417 | names are shown. This is the same as the `--decorate` option |
462cbb41 | 418 | of the `git log`. |
eb734454 | 419 | |
fd8d07ef EVW |
420 | log.follow:: |
421 | If `true`, `git log` will act as if the `--follow` option was used when | |
422 | a single <path> is given. This has the same limitations as `--follow`, | |
423 | i.e. it cannot be used to follow multiple files and does not work well | |
424 | on non-linear history. | |
425 | ||
73c727d6 NTND |
426 | log.graphColors:: |
427 | A list of colors, separated by commas, that can be used to draw | |
428 | history lines in `git log --graph`. | |
429 | ||
da0005b8 | 430 | log.showRoot:: |
0f03ca94 PB |
431 | If true, the initial commit will be shown as a big creation event. |
432 | This is equivalent to a diff against an empty tree. | |
5162e697 | 433 | Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which |
0f03ca94 PB |
434 | normally hide the root commit will now show it. True by default. |
435 | ||
ba4dce78 KM |
436 | log.showSignature:: |
437 | If true, makes linkgit:git-log[1], linkgit:git-show[1], and | |
438 | linkgit:git-whatchanged[1] assume `--show-signature`. | |
439 | ||
e6bb5f78 AP |
440 | log.mailmap:: |
441 | If true, makes linkgit:git-log[1], linkgit:git-show[1], and | |
442 | linkgit:git-whatchanged[1] assume `--use-mailmap`. | |
443 | ||
d5c4b185 MM |
444 | mailinfo.scissors:: |
445 | If true, makes linkgit:git-mailinfo[1] (and therefore | |
446 | linkgit:git-am[1]) act by default as if the --scissors option | |
447 | was provided on the command-line. When active, this features | |
448 | removes everything from the message body before a scissors | |
449 | line (i.e. consisting mainly of ">8", "8<" and "-"). | |
450 | ||
d551a488 MSO |
451 | mailmap.file:: |
452 | The location of an augmenting mailmap file. The default | |
453 | mailmap, located in the root of the repository, is loaded | |
454 | first, then the mailmap file pointed to by this variable. | |
455 | The location of the mailmap file may be in a repository | |
456 | subdirectory, or somewhere outside of the repository itself. | |
457 | See linkgit:git-shortlog[1] and linkgit:git-blame[1]. | |
458 | ||
08610900 JK |
459 | mailmap.blob:: |
460 | Like `mailmap.file`, but consider the value as a reference to a | |
8c473cec JK |
461 | blob in the repository. If both `mailmap.file` and |
462 | `mailmap.blob` are given, both are parsed, with entries from | |
463 | `mailmap.file` taking precedence. In a bare repository, this | |
464 | defaults to `HEAD:.mailmap`. In a non-bare repository, it | |
465 | defaults to empty. | |
08610900 | 466 | |
b5578f33 | 467 | man.viewer:: |
b8322ea8 | 468 | Specify the programs that may be used to display help in the |
b5578f33 CC |
469 | 'man' format. See linkgit:git-help[1]. |
470 | ||
0bb64009 CC |
471 | man.<tool>.cmd:: |
472 | Specify the command to invoke the specified man viewer. The | |
473 | specified command is evaluated in shell with the man page | |
474 | passed as argument. (See linkgit:git-help[1].) | |
475 | ||
7e8114c0 CC |
476 | man.<tool>.path:: |
477 | Override the path for the given tool that may be used to | |
478 | display help in the 'man' format. See linkgit:git-help[1]. | |
479 | ||
b0f34c3d | 480 | include::merge-config.txt[] |
b5412484 | 481 | |
77680caa JS |
482 | mergetool.<tool>.path:: |
483 | Override the path for the given tool. This is useful in case | |
484 | your tool is not in the PATH. | |
485 | ||
964473a0 CB |
486 | mergetool.<tool>.cmd:: |
487 | Specify the command to invoke the specified merge tool. The | |
488 | specified command is evaluated in shell with the following | |
489 | variables available: 'BASE' is the name of a temporary file | |
490 | containing the common base of the files to be merged, if available; | |
491 | 'LOCAL' is the name of a temporary file containing the contents of | |
492 | the file on the current branch; 'REMOTE' is the name of a temporary | |
493 | file containing the contents of the file from the branch being | |
494 | merged; 'MERGED' contains the name of the file to which the merge | |
495 | tool should write the results of a successful merge. | |
496 | ||
497 | mergetool.<tool>.trustExitCode:: | |
498 | For a custom merge command, specify whether the exit code of | |
499 | the merge command can be used to determine whether the merge was | |
500 | successful. If this is not set to true then the merge target file | |
501 | timestamp is checked and the merge assumed to have been successful | |
502 | if the file has been updated, otherwise the user is prompted to | |
503 | indicate the success of the merge. | |
504 | ||
b12d0450 DA |
505 | mergetool.meld.hasOutput:: |
506 | Older versions of `meld` do not support the `--output` option. | |
507 | Git will attempt to detect whether `meld` supports `--output` | |
508 | by inspecting the output of `meld --help`. Configuring | |
509 | `mergetool.meld.hasOutput` will make Git skip these checks and | |
510 | use the configured value instead. Setting `mergetool.meld.hasOutput` | |
511 | to `true` tells Git to unconditionally use the `--output` option, | |
512 | and `false` avoids using `--output`. | |
513 | ||
44c36d1c CB |
514 | mergetool.keepBackup:: |
515 | After performing a merge, the original file with conflict markers | |
516 | can be saved as a file with a `.orig` extension. If this variable | |
517 | is set to `false` then this file is not preserved. Defaults to | |
518 | `true` (i.e. keep the backup files). | |
519 | ||
162eba8b | 520 | mergetool.keepTemporaries:: |
2de9b711 | 521 | When invoking a custom merge tool, Git uses a set of temporary |
162eba8b CB |
522 | files to pass to the tool. If the tool returns an error and this |
523 | variable is set to `true`, then these temporary files will be | |
524 | preserved, otherwise they will be removed after the tool has | |
525 | exited. Defaults to `false`. | |
526 | ||
8f0cb41d DA |
527 | mergetool.writeToTemp:: |
528 | Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of | |
529 | conflicting files in the worktree by default. Git will attempt | |
530 | to use a temporary directory for these files when set `true`. | |
531 | Defaults to `false`. | |
532 | ||
682b451f CB |
533 | mergetool.prompt:: |
534 | Prompt before each invocation of the merge resolution program. | |
535 | ||
d2d68d99 JK |
536 | notes.mergeStrategy:: |
537 | Which merge strategy to choose by default when resolving notes | |
538 | conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or | |
539 | `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" | |
540 | section of linkgit:git-notes[1] for more information on each strategy. | |
541 | ||
4f655e22 JK |
542 | notes.<name>.mergeStrategy:: |
543 | Which merge strategy to choose when doing a notes merge into | |
544 | refs/notes/<name>. This overrides the more general | |
545 | "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in | |
546 | linkgit:git-notes[1] for more information on the available strategies. | |
547 | ||
894a9d33 TR |
548 | notes.displayRef:: |
549 | The (fully qualified) refname from which to show notes when | |
550 | showing commit messages. The value of this variable can be set | |
551 | to a glob, in which case notes from all matching refs will be | |
552 | shown. You may also specify this configuration variable | |
553 | several times. A warning will be issued for refs that do not | |
554 | exist, but a glob that does not match any refs is silently | |
555 | ignored. | |
556 | + | |
557 | This setting can be overridden with the `GIT_NOTES_DISPLAY_REF` | |
558 | environment variable, which must be a colon separated list of refs or | |
559 | globs. | |
560 | + | |
561 | The effective value of "core.notesRef" (possibly overridden by | |
562 | GIT_NOTES_REF) is also implicitly added to the list of refs to be | |
563 | displayed. | |
564 | ||
6956f858 TR |
565 | notes.rewrite.<command>:: |
566 | When rewriting commits with <command> (currently `amend` or | |
2de9b711 | 567 | `rebase`) and this variable is set to `true`, Git |
6956f858 TR |
568 | automatically copies your notes from the original to the |
569 | rewritten commit. Defaults to `true`, but see | |
570 | "notes.rewriteRef" below. | |
6956f858 TR |
571 | |
572 | notes.rewriteMode:: | |
573 | When copying notes during a rewrite (see the | |
574 | "notes.rewrite.<command>" option), determines what to do if | |
575 | the target commit already has a note. Must be one of | |
e48ad1b9 JK |
576 | `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. |
577 | Defaults to `concatenate`. | |
6956f858 TR |
578 | + |
579 | This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` | |
580 | environment variable. | |
581 | ||
582 | notes.rewriteRef:: | |
583 | When copying notes during a rewrite, specifies the (fully | |
584 | qualified) ref whose notes should be copied. The ref may be a | |
585 | glob, in which case notes in all matching refs will be copied. | |
586 | You may also specify this configuration several times. | |
587 | + | |
588 | Does not have a default value; you must configure this variable to | |
2b4aa89c TR |
589 | enable note rewriting. Set it to `refs/notes/commits` to enable |
590 | rewriting for the default commit notes. | |
cfb88e9a LAS |
591 | + |
592 | This setting can be overridden with the `GIT_NOTES_REWRITE_REF` | |
593 | environment variable, which must be a colon separated list of refs or | |
594 | globs. | |
6956f858 | 595 | |
4812a93a | 596 | pack.window:: |
5162e697 | 597 | The size of the window used by linkgit:git-pack-objects[1] when no |
4812a93a JK |
598 | window size is given on the command line. Defaults to 10. |
599 | ||
842aaf93 | 600 | pack.depth:: |
5162e697 | 601 | The maximum delta depth used by linkgit:git-pack-objects[1] when no |
618e613a | 602 | maximum depth is given on the command line. Defaults to 50. |
b5c0cbd8 | 603 | Maximum value is 4095. |
842aaf93 | 604 | |
e93b15cd | 605 | pack.windowMemory:: |
f4694a8c RB |
606 | The maximum size of memory that is consumed by each thread |
607 | in linkgit:git-pack-objects[1] for pack window memory when | |
608 | no limit is given on the command line. The value can be | |
609 | suffixed with "k", "m", or "g". When left unconfigured (or | |
610 | set explicitly to 0), there will be no limit. | |
e93b15cd | 611 | |
960ccca6 DH |
612 | pack.compression:: |
613 | An integer -1..9, indicating the compression level for objects | |
614 | in a pack file. -1 is the zlib default. 0 means no | |
615 | compression, and 1..9 are various speed/size tradeoffs, 9 being | |
616 | slowest. If not set, defaults to core.compression. If that is | |
dec92309 BD |
617 | not set, defaults to -1, the zlib default, which is "a default |
618 | compromise between speed and compression (currently equivalent | |
619 | to level 6)." | |
89d71f75 JK |
620 | + |
621 | Note that changing the compression level will not automatically recompress | |
622 | all existing objects. You can force recompression by passing the -F option | |
623 | to linkgit:git-repack[1]. | |
960ccca6 | 624 | |
28b8a730 JK |
625 | pack.island:: |
626 | An extended regular expression configuring a set of delta | |
627 | islands. See "DELTA ISLANDS" in linkgit:git-pack-objects[1] | |
628 | for details. | |
629 | ||
630 | pack.islandCore:: | |
631 | Specify an island name which gets to have its objects be | |
632 | packed first. This creates a kind of pseudo-pack at the front | |
633 | of one pack, so that the objects from the specified island are | |
634 | hopefully faster to copy into any pack that should be served | |
635 | to a user requesting these objects. In practice this means | |
636 | that the island specified should likely correspond to what is | |
637 | the most commonly cloned in the repo. See also "DELTA ISLANDS" | |
638 | in linkgit:git-pack-objects[1]. | |
639 | ||
074b2eea | 640 | pack.deltaCacheSize:: |
02783075 | 641 | The maximum memory in bytes used for caching deltas in |
5749b0b2 NP |
642 | linkgit:git-pack-objects[1] before writing them out to a pack. |
643 | This cache is used to speed up the writing object phase by not | |
644 | having to recompute the final delta result once the best match | |
645 | for all objects is found. Repacking large repositories on machines | |
646 | which are tight with memory might be badly impacted by this though, | |
647 | especially if this cache pushes the system into swapping. | |
648 | A value of 0 means no limit. The smallest size of 1 byte may be | |
649 | used to virtually disable this cache. Defaults to 256 MiB. | |
074b2eea | 650 | |
e3dfddb3 | 651 | pack.deltaCacheLimit:: |
693b86ff | 652 | The maximum size of a delta, that is cached in |
5749b0b2 NP |
653 | linkgit:git-pack-objects[1]. This cache is used to speed up the |
654 | writing object phase by not having to recompute the final delta | |
0cb3c142 NTND |
655 | result once the best match for all objects is found. |
656 | Defaults to 1000. Maximum value is 65535. | |
e3dfddb3 | 657 | |
693b86ff NP |
658 | pack.threads:: |
659 | Specifies the number of threads to spawn when searching for best | |
5162e697 | 660 | delta matches. This requires that linkgit:git-pack-objects[1] |
693b86ff NP |
661 | be compiled with pthreads otherwise this option is ignored with a |
662 | warning. This is meant to reduce packing time on multiprocessor | |
663 | machines. The required amount of memory for the delta search window | |
664 | is however multiplied by the number of threads. | |
2de9b711 | 665 | Specifying 0 will cause Git to auto-detect the number of CPU's |
833e3df1 | 666 | and set the number of threads accordingly. |
693b86ff | 667 | |
4d00bda2 NP |
668 | pack.indexVersion:: |
669 | Specify the default pack index version. Valid values are 1 for | |
670 | legacy pack index used by Git versions prior to 1.5.2, and 2 for | |
671 | the new pack index with capabilities for packs larger than 4 GB | |
672 | as well as proper protection against the repacking of corrupted | |
c0a5e2d4 NP |
673 | packs. Version 2 is the default. Note that version 2 is enforced |
674 | and this config option ignored whenever the corresponding pack is | |
675 | larger than 2 GB. | |
676 | + | |
2de9b711 | 677 | If you have an old Git that does not understand the version 2 `*.idx` file, |
0d0bac67 | 678 | cloning or fetching over a non native protocol (e.g. "http") |
6cf378f0 | 679 | that will copy both `*.pack` file and corresponding `*.idx` file from the |
c0a5e2d4 | 680 | other side may give you a repository that cannot be accessed with your |
2de9b711 | 681 | older version of Git. If the `*.pack` file is smaller than 2 GB, however, |
c0a5e2d4 | 682 | you can use linkgit:git-index-pack[1] on the *.pack file to regenerate |
6cf378f0 | 683 | the `*.idx` file. |
4d00bda2 | 684 | |
dbdbfec4 | 685 | pack.packSizeLimit:: |
07cf0f24 NP |
686 | The maximum size of a pack. This setting only affects |
687 | packing to a file when repacking, i.e. the git:// protocol | |
6cf378f0 | 688 | is unaffected. It can be overridden by the `--max-pack-size` |
9cea46cd EW |
689 | option of linkgit:git-repack[1]. Reaching this limit results |
690 | in the creation of multiple packfiles; which in turn prevents | |
691 | bitmaps from being created. | |
692 | The minimum size allowed is limited to 1 MiB. | |
693 | The default is unlimited. | |
07cf0f24 NP |
694 | Common unit suffixes of 'k', 'm', or 'g' are |
695 | supported. | |
2b84b5a8 | 696 | |
6b8fda2d VM |
697 | pack.useBitmaps:: |
698 | When true, git will use pack bitmaps (if available) when packing | |
699 | to stdout (e.g., during the server side of a fetch). Defaults to | |
700 | true. You should not generally need to turn this off unless | |
701 | you are debugging pack bitmaps. | |
702 | ||
da0005b8 | 703 | pack.writeBitmaps (deprecated):: |
71d76cb4 | 704 | This is a deprecated synonym for `repack.writeBitmaps`. |
7cc8f971 | 705 | |
ae4f07fb VM |
706 | pack.writeBitmapHashCache:: |
707 | When true, git will include a "hash cache" section in the bitmap | |
708 | index (if one is written). This cache can be used to feed git's | |
709 | delta heuristics, potentially leading to better deltas between | |
710 | bitmapped and non-bitmapped objects (e.g., when serving a fetch | |
711 | between an older, bitmapped pack and objects that have been | |
712 | pushed since the last gc). The downside is that it consumes 4 | |
713 | bytes per object of disk space, and that JGit's bitmap | |
714 | implementation does not understand it, causing it to complain if | |
715 | Git and JGit are used on the same repository. Defaults to false. | |
716 | ||
4370c2d6 | 717 | pager.<cmd>:: |
9bad7233 | 718 | If the value is boolean, turns on or off pagination of the |
2de9b711 | 719 | output of a particular Git subcommand when writing to a tty. |
9bad7233 | 720 | Otherwise, turns on pagination for the subcommand using the |
6cf378f0 JK |
721 | pager specified by the value of `pager.<cmd>`. If `--paginate` |
722 | or `--no-pager` is specified on the command line, it takes | |
9bad7233 JK |
723 | precedence over this option. To disable pagination for all |
724 | commands, set `core.pager` or `GIT_PAGER` to `cat`. | |
4370c2d6 | 725 | |
8028184e WP |
726 | pretty.<name>:: |
727 | Alias for a --pretty= format string, as specified in | |
728 | linkgit:git-log[1]. Any aliases defined here can be used just | |
729 | as the built-in pretty formats could. For example, | |
6cf378f0 | 730 | running `git config pretty.changelog "format:* %H %s"` |
8028184e | 731 | would cause the invocation `git log --pretty=changelog` |
6cf378f0 | 732 | to be equivalent to running `git log "--pretty=format:* %H %s"`. |
8028184e WP |
733 | Note that an alias with the same name as a built-in format |
734 | will be silently ignored. | |
735 | ||
f1762d77 BW |
736 | protocol.allow:: |
737 | If set, provide a user defined default policy for all protocols which | |
738 | don't explicitly have a policy (`protocol.<name>.allow`). By default, | |
739 | if unset, known-safe protocols (http, https, git, ssh, file) have a | |
740 | default policy of `always`, known-dangerous protocols (ext) have a | |
741 | default policy of `never`, and all other protocols have a default | |
742 | policy of `user`. Supported policies: | |
743 | + | |
744 | -- | |
745 | ||
746 | * `always` - protocol is always able to be used. | |
747 | ||
748 | * `never` - protocol is never able to be used. | |
749 | ||
750 | * `user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is | |
751 | either unset or has a value of 1. This policy should be used when you want a | |
752 | protocol to be directly usable by the user but don't want it used by commands which | |
753 | execute clone/fetch/push commands without user input, e.g. recursive | |
754 | submodule initialization. | |
755 | ||
756 | -- | |
757 | ||
758 | protocol.<name>.allow:: | |
759 | Set a policy to be used by protocol `<name>` with clone/fetch/push | |
760 | commands. See `protocol.allow` above for the available policies. | |
761 | + | |
762 | The protocol names currently used by git are: | |
763 | + | |
764 | -- | |
765 | - `file`: any local file-based path (including `file://` URLs, | |
766 | or local paths) | |
767 | ||
768 | - `git`: the anonymous git protocol over a direct TCP | |
769 | connection (or proxy, if configured) | |
770 | ||
771 | - `ssh`: git over ssh (including `host:path` syntax, | |
772 | `ssh://`, etc). | |
773 | ||
774 | - `http`: git over http, both "smart http" and "dumb http". | |
775 | Note that this does _not_ include `https`; if you want to configure | |
776 | both, you must do so individually. | |
777 | ||
778 | - any external helpers are named by their protocol (e.g., use | |
779 | `hg` to allow the `git-remote-hg` helper) | |
780 | -- | |
781 | ||
373d70ef BW |
782 | protocol.version:: |
783 | Experimental. If set, clients will attempt to communicate with a | |
784 | server using the specified protocol version. If unset, no | |
785 | attempt will be made by the client to communicate using a | |
786 | particular protocol version, this results in protocol version 0 | |
787 | being used. | |
788 | Supported versions: | |
789 | + | |
790 | -- | |
791 | ||
792 | * `0` - the original wire protocol. | |
793 | ||
794 | * `1` - the original wire protocol with the addition of a version string | |
795 | in the initial response from the server. | |
796 | ||
db2d36fa BW |
797 | * `2` - link:technical/protocol-v2.html[wire protocol version 2]. |
798 | ||
373d70ef BW |
799 | -- |
800 | ||
04750299 | 801 | include::pull-config.txt[] |
d8052750 | 802 | |
41b651d6 | 803 | include::push-config.txt[] |
b33a15b0 | 804 | |
946a9f20 | 805 | include::rebase-config.txt[] |
16cf51c7 | 806 | |
aaa3b458 | 807 | include::receive-config.txt[] |
0a1bc12b | 808 | |
da0005b8 | 809 | remote.pushDefault:: |
224c2171 | 810 | The remote to push to by default. Overrides |
9f765ce6 | 811 | `branch.<name>.remote` for all branches, and is overridden by |
da0005b8 | 812 | `branch.<name>.pushRemote` for specific branches. |
224c2171 | 813 | |
0cc6d346 | 814 | remote.<name>.url:: |
5162e697 DM |
815 | The URL of a remote repository. See linkgit:git-fetch[1] or |
816 | linkgit:git-push[1]. | |
0cc6d346 | 817 | |
20346234 MG |
818 | remote.<name>.pushurl:: |
819 | The push URL of a remote repository. See linkgit:git-push[1]. | |
820 | ||
14c98218 SV |
821 | remote.<name>.proxy:: |
822 | For remotes that require curl (http, https and ftp), the URL to | |
823 | the proxy to use for that remote. Set to the empty string to | |
824 | disable proxying for that remote. | |
825 | ||
ef976395 KF |
826 | remote.<name>.proxyAuthMethod:: |
827 | For remotes that require curl (http, https and ftp), the method to use for | |
828 | authenticating against the proxy in use (probably set in | |
829 | `remote.<name>.proxy`). See `http.proxyAuthMethod`. | |
830 | ||
0cc6d346 | 831 | remote.<name>.fetch:: |
5162e697 DM |
832 | The default set of "refspec" for linkgit:git-fetch[1]. See |
833 | linkgit:git-fetch[1]. | |
0cc6d346 SB |
834 | |
835 | remote.<name>.push:: | |
5162e697 DM |
836 | The default set of "refspec" for linkgit:git-push[1]. See |
837 | linkgit:git-push[1]. | |
0cc6d346 | 838 | |
84bb2dfd PB |
839 | remote.<name>.mirror:: |
840 | If true, pushing to this remote will automatically behave | |
6cf378f0 | 841 | as if the `--mirror` option was given on the command line. |
84bb2dfd | 842 | |
1918278e TT |
843 | remote.<name>.skipDefaultUpdate:: |
844 | If true, this remote will be skipped by default when updating | |
7cc91a2f BG |
845 | using linkgit:git-fetch[1] or the `update` subcommand of |
846 | linkgit:git-remote[1]. | |
847 | ||
848 | remote.<name>.skipFetchAll:: | |
849 | If true, this remote will be skipped by default when updating | |
850 | using linkgit:git-fetch[1] or the `update` subcommand of | |
851 | linkgit:git-remote[1]. | |
1918278e | 852 | |
060aafc1 | 853 | remote.<name>.receivepack:: |
5dee29ac | 854 | The default program to execute on the remote side when pushing. See |
1c262bb7 | 855 | option --receive-pack of linkgit:git-push[1]. |
060aafc1 | 856 | |
5dee29ac UKK |
857 | remote.<name>.uploadpack:: |
858 | The default program to execute on the remote side when fetching. See | |
1c262bb7 | 859 | option --upload-pack of linkgit:git-fetch-pack[1]. |
5dee29ac | 860 | |
da0005b8 | 861 | remote.<name>.tagOpt:: |
1c262bb7 JK |
862 | Setting this value to --no-tags disables automatic tag following when |
863 | fetching from remote <name>. Setting it to --tags will fetch every | |
944163a4 | 864 | tag from remote <name>, even if they are not reachable from remote |
ed368546 | 865 | branch heads. Passing these flags directly to linkgit:git-fetch[1] can |
1c262bb7 | 866 | override this setting. See options --tags and --no-tags of |
ed368546 | 867 | linkgit:git-fetch[1]. |
047f636d | 868 | |
c578f51d | 869 | remote.<name>.vcs:: |
2de9b711 | 870 | Setting this to a value <vcs> will cause Git to interact with |
c578f51d DB |
871 | the remote with the git-remote-<vcs> helper. |
872 | ||
737c5a9c MS |
873 | remote.<name>.prune:: |
874 | When set to true, fetching from this remote by default will also | |
0838bf47 MH |
875 | remove any remote-tracking references that no longer exist on the |
876 | remote (as if the `--prune` option was given on the command line). | |
737c5a9c MS |
877 | Overrides `fetch.prune` settings, if any. |
878 | ||
97716d21 ÆAB |
879 | remote.<name>.pruneTags:: |
880 | When set to true, fetching from this remote by default will also | |
881 | remove any local tags that no longer exist on the remote if pruning | |
882 | is activated in general via `remote.<name>.prune`, `fetch.prune` or | |
883 | `--prune`. Overrides `fetch.pruneTags` settings, if any. | |
627a129b ÆAB |
884 | + |
885 | See also `remote.<name>.prune` and the PRUNING section of | |
886 | linkgit:git-fetch[1]. | |
737c5a9c | 887 | |
1918278e TT |
888 | remotes.<group>:: |
889 | The list of remotes which are fetched by "git remote update | |
5162e697 | 890 | <group>". See linkgit:git-remote[1]. |
1918278e | 891 | |
da0005b8 | 892 | repack.useDeltaBaseOffset:: |
22c79eab NP |
893 | By default, linkgit:git-repack[1] creates packs that use |
894 | delta-base offset. If you need to share your repository with | |
2de9b711 | 895 | Git older than version 1.4.4, either directly or via a dumb |
22c79eab | 896 | protocol such as http, then you need to set this option to |
2de9b711 | 897 | "false" and repack. Access from old Git versions over the |
22c79eab | 898 | native protocol are unaffected by this option. |
b6945f57 | 899 | |
ee34a2be JK |
900 | repack.packKeptObjects:: |
901 | If set to true, makes `git repack` act as if | |
902 | `--pack-kept-objects` was passed. See linkgit:git-repack[1] for | |
903 | details. Defaults to `false` normally, but `true` if a bitmap | |
904 | index is being written (either via `--write-bitmap-index` or | |
71d76cb4 JK |
905 | `repack.writeBitmaps`). |
906 | ||
16d75fa4 JK |
907 | repack.useDeltaIslands:: |
908 | If set to true, makes `git repack` act as if `--delta-islands` | |
909 | was passed. Defaults to `false`. | |
910 | ||
71d76cb4 JK |
911 | repack.writeBitmaps:: |
912 | When true, git will write a bitmap index when packing all | |
913 | objects to disk (e.g., when `git repack -a` is run). This | |
914 | index can speed up the "counting objects" phase of subsequent | |
915 | packs created for clones and fetches, at the cost of some disk | |
9cea46cd EW |
916 | space and extra time spent on the initial repack. This has |
917 | no effect if multiple packfiles are created. | |
918 | Defaults to false. | |
ee34a2be | 919 | |
da0005b8 | 920 | rerere.autoUpdate:: |
b0f34c3d MM |
921 | When set to true, `git-rerere` updates the index with the |
922 | resulting contents after it cleanly resolves conflicts using | |
923 | previously recorded resolution. Defaults to false. | |
924 | ||
925 | rerere.enabled:: | |
926 | Activate recording of resolved conflicts, so that identical | |
07b88a00 TR |
927 | conflict hunks can be resolved automatically, should they be |
928 | encountered again. By default, linkgit:git-rerere[1] is | |
929 | enabled if there is an `rr-cache` directory under the | |
b6fb7fed JH |
930 | `$GIT_DIR`, e.g. if "rerere" was previously used in the |
931 | repository. | |
b0f34c3d | 932 | |
4c3abd05 BP |
933 | reset.quiet:: |
934 | When set to true, 'git reset' will default to the '--quiet' option. | |
935 | ||
701137ee | 936 | include::sendemail-config.txt[] |
5453b83b | 937 | |
8dc9d22d NTND |
938 | sequence.editor:: |
939 | Text editor used by `git rebase -i` for editing the rebase instruction file. | |
940 | The value is meant to be interpreted by the shell when it is used. | |
941 | It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. | |
942 | When not configured the default commit message editor is used instead. | |
943 | ||
8da2f489 | 944 | showBranch.default:: |
5162e697 DM |
945 | The default set of branches for linkgit:git-show-branch[1]. |
946 | See linkgit:git-show-branch[1]. | |
1ab661dd | 947 | |
e77cf4ee CC |
948 | splitIndex.maxPercentChange:: |
949 | When the split index feature is used, this specifies the | |
950 | percent of entries the split index can contain compared to the | |
951 | total number of entries in both the split index and the shared | |
952 | index before a new shared index is written. | |
953 | The value should be between 0 and 100. If the value is 0 then | |
954 | a new shared index is always written, if it is 100 a new | |
955 | shared index is never written. | |
956 | By default the value is 20, so a new shared index is written | |
957 | if the number of entries in the split index would be greater | |
958 | than 20 percent of the total number of entries. | |
959 | See linkgit:git-update-index[1]. | |
960 | ||
b2dd1c5c CC |
961 | splitIndex.sharedIndexExpire:: |
962 | When the split index feature is used, shared index files that | |
963 | were not modified since the time this variable specifies will | |
964 | be removed when a new shared index file is created. The value | |
965 | "now" expires all entries immediately, and "never" suppresses | |
966 | expiration altogether. | |
967 | The default value is "2.weeks.ago". | |
968 | Note that a shared index file is considered modified (for the | |
969 | purpose of expiration) each time a new split-index file is | |
b4601395 | 970 | either created based on it or read from it. |
b2dd1c5c CC |
971 | See linkgit:git-update-index[1]. |
972 | ||
12e60249 NTND |
973 | include::config/ssh.txt[] |
974 | ||
46f721c8 | 975 | status.relativePaths:: |
5162e697 | 976 | By default, linkgit:git-status[1] shows paths relative to the |
46f721c8 | 977 | current directory. Setting this variable to `false` shows paths |
2de9b711 | 978 | relative to the repository root (this was the default for Git |
46f721c8 JK |
979 | prior to v1.5.4). |
980 | ||
4fb5166a JJGG |
981 | status.short:: |
982 | Set to true to enable --short by default in linkgit:git-status[1]. | |
983 | The option --no-short takes precedence over this variable. | |
984 | ||
ec85d070 JJGG |
985 | status.branch:: |
986 | Set to true to enable --branch by default in linkgit:git-status[1]. | |
987 | The option --no-branch takes precedence over this variable. | |
988 | ||
2556b996 MM |
989 | status.displayCommentPrefix:: |
990 | If set to true, linkgit:git-status[1] will insert a comment | |
991 | prefix before each output line (starting with | |
992 | `core.commentChar`, i.e. `#` by default). This was the | |
993 | behavior of linkgit:git-status[1] in Git 1.8.4 and previous. | |
994 | Defaults to false. | |
995 | ||
e8b2dc2c BP |
996 | status.renameLimit:: |
997 | The number of files to consider when performing rename detection | |
998 | in linkgit:git-status[1] and linkgit:git-commit[1]. Defaults to | |
999 | the value of diff.renameLimit. | |
1000 | ||
1001 | status.renames:: | |
1002 | Whether and how Git detects renames in linkgit:git-status[1] and | |
1003 | linkgit:git-commit[1] . If set to "false", rename detection is | |
1004 | disabled. If set to "true", basic rename detection is enabled. | |
1005 | If set to "copies" or "copy", Git will detect copies, as well. | |
1006 | Defaults to the value of diff.renames. | |
1007 | ||
c1b5d019 LB |
1008 | status.showStash:: |
1009 | If set to true, linkgit:git-status[1] will display the number of | |
1010 | entries currently stashed away. | |
1011 | Defaults to false. | |
1012 | ||
d6293d1f MSO |
1013 | status.showUntrackedFiles:: |
1014 | By default, linkgit:git-status[1] and linkgit:git-commit[1] show | |
1015 | files which are not currently tracked by Git. Directories which | |
1016 | contain only untracked files, are shown with the directory name | |
1017 | only. Showing untracked files means that Git needs to lstat() all | |
71069cdf | 1018 | the files in the whole repository, which might be slow on some |
d6293d1f MSO |
1019 | systems. So, this variable controls how the commands displays |
1020 | the untracked files. Possible values are: | |
1021 | + | |
1022 | -- | |
9373bdc4 CF |
1023 | * `no` - Show no untracked files. |
1024 | * `normal` - Show untracked files and directories. | |
1025 | * `all` - Show also individual files in untracked directories. | |
d6293d1f MSO |
1026 | -- |
1027 | + | |
1028 | If this variable is not specified, it defaults to 'normal'. | |
1029 | This variable can be overridden with the -u|--untracked-files option | |
1030 | of linkgit:git-status[1] and linkgit:git-commit[1]. | |
1031 | ||
da0005b8 | 1032 | status.submoduleSummary:: |
4b2343fa MG |
1033 | Defaults to false. |
1034 | If this is set to a non zero number or true (identical to -1 or an | |
1035 | unlimited number), the submodule summary will be enabled and a | |
1036 | summary of commits for modified submodules will be shown (see | |
bb58b696 JL |
1037 | --summary-limit option of linkgit:git-submodule[1]). Please note |
1038 | that the summary output command will be suppressed for all | |
1039 | submodules when `diff.ignoreSubmodules` is set to 'all' or only | |
1d2f393a JL |
1040 | for those submodules where `submodule.<name>.ignore=all`. The only |
1041 | exception to that rule is that status and commit will show staged | |
1042 | submodule changes. To | |
bb58b696 | 1043 | also view the summary for ignored submodules you can either use |
06ab60c0 | 1044 | the --ignore-submodules=dirty command-line option or the 'git |
bb58b696 JL |
1045 | submodule summary' command, which shows a similar output but does |
1046 | not honor these settings. | |
4b2343fa | 1047 | |
3086c064 NK |
1048 | stash.showPatch:: |
1049 | If this is set to true, the `git stash show` command without an | |
e01db917 | 1050 | option will show the stash entry in patch form. Defaults to false. |
3086c064 NK |
1051 | See description of 'show' command in linkgit:git-stash[1]. |
1052 | ||
1053 | stash.showStat:: | |
1054 | If this is set to true, the `git stash show` command without an | |
e01db917 | 1055 | option will show diffstat of the stash entry. Defaults to true. |
3086c064 NK |
1056 | See description of 'show' command in linkgit:git-stash[1]. |
1057 | ||
6014363f | 1058 | include::submodule-config.txt[] |
31224cbd | 1059 | |
61c2fe0c LA |
1060 | tag.forceSignAnnotated:: |
1061 | A boolean to specify whether annotated tags created should be GPG signed. | |
1062 | If `--annotate` is specified on the command line, it takes | |
1063 | precedence over this option. | |
1064 | ||
b150794d JK |
1065 | tag.sort:: |
1066 | This variable controls the sort ordering of tags when displayed by | |
1067 | linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the | |
1068 | value of this variable will be used as the default. | |
1069 | ||
ce1a79b6 | 1070 | tar.umask:: |
687157c7 RS |
1071 | This variable can be used to restrict the permission bits of |
1072 | tar archive entries. The default is 0002, which turns off the | |
1073 | world write bit. The special value "user" indicates that the | |
1074 | archiving user's umask will be used instead. See umask(2) and | |
5162e697 | 1075 | linkgit:git-archive[1]. |
ce1a79b6 | 1076 | |
dab76d3a JH |
1077 | transfer.fsckObjects:: |
1078 | When `fetch.fsckObjects` or `receive.fsckObjects` are | |
1079 | not set, the value of this variable is used instead. | |
1080 | Defaults to false. | |
5180dd2e ÆAB |
1081 | + |
1082 | When set, the fetch or receive will abort in the case of a malformed | |
456bab87 ÆAB |
1083 | object or a link to a nonexistent object. In addition, various other |
1084 | issues are checked for, including legacy issues (see `fsck.<msg-id>`), | |
1085 | and potential security issues like the existence of a `.GIT` directory | |
1086 | or a malicious `.gitmodules` file (see the release notes for v2.2.1 | |
1087 | and v2.17.1 for details). Other sanity and security checks may be | |
1088 | added in future releases. | |
1089 | + | |
1090 | On the receiving side, failing fsckObjects will make those objects | |
1091 | unreachable, see "QUARANTINE ENVIRONMENT" in | |
1092 | linkgit:git-receive-pack[1]. On the fetch side, malformed objects will | |
1093 | instead be left unreferenced in the repository. | |
720dae5a ÆAB |
1094 | + |
1095 | Due to the non-quarantine nature of the `fetch.fsckObjects` | |
1096 | implementation it can not be relied upon to leave the object store | |
1097 | clean like `receive.fsckObjects` can. | |
1098 | + | |
1099 | As objects are unpacked they're written to the object store, so there | |
1100 | can be cases where malicious objects get introduced even though the | |
1101 | "fetch" failed, only to have a subsequent "fetch" succeed because only | |
1102 | new incoming objects are checked, not those that have already been | |
1103 | written to the object store. That difference in behavior should not be | |
1104 | relied upon. In the future, such objects may be quarantined for | |
1105 | "fetch" as well. | |
1106 | + | |
1107 | For now, the paranoid need to find some way to emulate the quarantine | |
1108 | environment if they'd like the same protection as "push". E.g. in the | |
1109 | case of an internal mirror do the mirroring in two steps, one to fetch | |
1110 | the untrusted objects, and then do a second "push" (which will use the | |
1111 | quarantine) to another internal repo, and have internal clients | |
1112 | consume this pushed-to repository, or embargo internal fetches and | |
1113 | only allow them once a full "fsck" has run (and no new fetches have | |
1114 | happened in the meantime). | |
dab76d3a | 1115 | |
da0005b8 | 1116 | transfer.hideRefs:: |
cc118a65 JK |
1117 | String(s) `receive-pack` and `upload-pack` use to decide which |
1118 | refs to omit from their initial advertisements. Use more than | |
1119 | one definition to specify multiple prefix strings. A ref that is | |
1120 | under the hierarchies listed in the value of this variable is | |
1121 | excluded, and is hidden when responding to `git push` or `git | |
1122 | fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for | |
1123 | program-specific versions of this config. | |
2bc31d16 JK |
1124 | + |
1125 | You may also include a `!` in front of the ref name to negate the entry, | |
1126 | explicitly exposing it, even if an earlier entry marked it as hidden. | |
1127 | If you have multiple hideRefs values, later entries override earlier ones | |
1128 | (and entries in more-specific config files override less-specific ones). | |
92cab492 LF |
1129 | + |
1130 | If a namespace is in use, the namespace prefix is stripped from each | |
1131 | reference before it is matched against `transfer.hiderefs` patterns. | |
1132 | For example, if `refs/heads/master` is specified in `transfer.hideRefs` and | |
1133 | the current namespace is `foo`, then `refs/namespaces/foo/refs/heads/master` | |
1134 | is omitted from the advertisements but `refs/heads/master` and | |
1135 | `refs/namespaces/bar/refs/heads/master` are still advertised as so-called | |
78a766ab LF |
1136 | "have" lines. In order to match refs before stripping, add a `^` in front of |
1137 | the ref name. If you combine `!` and `^`, `!` must be specified first. | |
235ec243 MM |
1138 | + |
1139 | Even if you hide refs, a client may still be able to steal the target | |
1140 | objects via the techniques described in the "SECURITY" section of the | |
1141 | linkgit:gitnamespaces[7] man page; it's best to keep private data in a | |
1142 | separate repository. | |
daebaa78 | 1143 | |
b0f34c3d MM |
1144 | transfer.unpackLimit:: |
1145 | When `fetch.unpackLimit` or `receive.unpackLimit` are | |
1146 | not set, the value of this variable is used instead. | |
1147 | The default value is 100. | |
1148 | ||
7671b632 SG |
1149 | uploadarchive.allowUnreachable:: |
1150 | If true, allow clients to use `git archive --remote` to request | |
1151 | any tree, whether reachable from the ref tips or not. See the | |
235ec243 | 1152 | discussion in the "SECURITY" section of |
7671b632 SG |
1153 | linkgit:git-upload-archive[1] for more details. Defaults to |
1154 | `false`. | |
1155 | ||
da0005b8 | 1156 | uploadpack.hideRefs:: |
cc118a65 JK |
1157 | This variable is the same as `transfer.hideRefs`, but applies |
1158 | only to `upload-pack` (and so affects only fetches, not pushes). | |
1159 | An attempt to fetch a hidden ref by `git fetch` will fail. See | |
1160 | also `uploadpack.allowTipSHA1InWant`. | |
390eb36b | 1161 | |
bc0a4741 | 1162 | uploadpack.allowTipSHA1InWant:: |
da0005b8 | 1163 | When `uploadpack.hideRefs` is in effect, allow `upload-pack` |
390eb36b JH |
1164 | to accept a fetch request that asks for an object at the tip |
1165 | of a hidden ref (by default, such a request is rejected). | |
235ec243 MM |
1166 | See also `uploadpack.hideRefs`. Even if this is false, a client |
1167 | may be able to steal objects via the techniques described in the | |
1168 | "SECURITY" section of the linkgit:gitnamespaces[7] man page; it's | |
1169 | best to keep private data in a separate repository. | |
daebaa78 | 1170 | |
68ee6289 FM |
1171 | uploadpack.allowReachableSHA1InWant:: |
1172 | Allow `upload-pack` to accept a fetch request that asks for an | |
1173 | object that is reachable from any ref tip. However, note that | |
1174 | calculating object reachability is computationally expensive. | |
235ec243 MM |
1175 | Defaults to `false`. Even if this is false, a client may be able |
1176 | to steal objects via the techniques described in the "SECURITY" | |
1177 | section of the linkgit:gitnamespaces[7] man page; it's best to | |
1178 | keep private data in a separate repository. | |
68ee6289 | 1179 | |
f8edeaa0 DT |
1180 | uploadpack.allowAnySHA1InWant:: |
1181 | Allow `upload-pack` to accept a fetch request that asks for any | |
1182 | object at all. | |
1183 | Defaults to `false`. | |
1184 | ||
da0005b8 | 1185 | uploadpack.keepAlive:: |
05e95155 JK |
1186 | When `upload-pack` has started `pack-objects`, there may be a |
1187 | quiet period while `pack-objects` prepares the pack. Normally | |
1188 | it would output progress information, but if `--quiet` was used | |
1189 | for the fetch, `pack-objects` will output nothing at all until | |
1190 | the pack data begins. Some clients and networks may consider | |
1191 | the server to be hung and give up. Setting this option instructs | |
1192 | `upload-pack` to send an empty keepalive packet every | |
da0005b8 | 1193 | `uploadpack.keepAlive` seconds. Setting this option to 0 |
115dedd7 | 1194 | disables keepalive packets entirely. The default is 5 seconds. |
05e95155 | 1195 | |
20b20a22 JK |
1196 | uploadpack.packObjectsHook:: |
1197 | If this option is set, when `upload-pack` would run | |
1198 | `git pack-objects` to create a packfile for a client, it will | |
1199 | run this shell command instead. The `pack-objects` command and | |
1200 | arguments it _would_ have run (including the `git pack-objects` | |
1201 | at the beginning) are appended to the shell command. The stdin | |
1202 | and stdout of the hook are treated as if `pack-objects` itself | |
1203 | was run. I.e., `upload-pack` will feed input intended for | |
1204 | `pack-objects` to the hook, and expects a completed packfile on | |
1205 | stdout. | |
1206 | + | |
1207 | Note that this configuration variable is ignored if it is seen in the | |
1208 | repository-level config (this is a safety measure against fetching from | |
1209 | untrusted repositories). | |
1210 | ||
e56b5355 NTND |
1211 | uploadpack.allowFilter:: |
1212 | If this option is set, `upload-pack` will support partial | |
1213 | clone and partial fetch object filtering. | |
1214 | ||
516e2b76 BW |
1215 | uploadpack.allowRefInWant:: |
1216 | If this option is set, `upload-pack` will support the `ref-in-want` | |
1217 | feature of the protocol version 2 `fetch` command. This feature | |
1218 | is intended for the benefit of load-balanced servers which may | |
1219 | not have the same view of what OIDs their refs point to due to | |
1220 | replication delay. | |
1221 | ||
55029ae4 DB |
1222 | url.<base>.insteadOf:: |
1223 | Any URL that starts with this value will be rewritten to | |
1224 | start, instead, with <base>. In cases where some site serves a | |
1225 | large number of repositories, and serves them with multiple | |
1226 | access methods, and some users need to use different access | |
1227 | methods, this feature allows people to specify any of the | |
2de9b711 | 1228 | equivalent URLs and have Git automatically rewrite the URL to |
55029ae4 | 1229 | the best alternative for the particular user, even for a |
844112ca JH |
1230 | never-before-seen repository on the site. When more than one |
1231 | insteadOf strings match a given URL, the longest match is used. | |
2c9a2ae2 JK |
1232 | + |
1233 | Note that any protocol restrictions will be applied to the rewritten | |
1234 | URL. If the rewrite changes the URL to use a custom protocol or remote | |
1235 | helper, you may need to adjust the `protocol.*.allow` config to permit | |
1236 | the request. In particular, protocols you expect to use for submodules | |
1237 | must be set to `always` rather than the default of `user`. See the | |
1238 | description of `protocol.allow` above. | |
55029ae4 | 1239 | |
1c2eafb8 JT |
1240 | url.<base>.pushInsteadOf:: |
1241 | Any URL that starts with this value will not be pushed to; | |
1242 | instead, it will be rewritten to start with <base>, and the | |
1243 | resulting URL will be pushed to. In cases where some site serves | |
1244 | a large number of repositories, and serves them with multiple | |
1245 | access methods, some of which do not allow push, this feature | |
2de9b711 | 1246 | allows people to specify a pull-only URL and have Git |
1c2eafb8 JT |
1247 | automatically use an appropriate URL to push, even for a |
1248 | never-before-seen repository on the site. When more than one | |
1249 | pushInsteadOf strings match a given URL, the longest match is | |
2de9b711 | 1250 | used. If a remote has an explicit pushurl, Git will ignore this |
1c2eafb8 JT |
1251 | setting for that remote. |
1252 | ||
1ab661dd PB |
1253 | user.email:: |
1254 | Your email address to be recorded in any newly created commits. | |
eee7f4a2 | 1255 | Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and |
47d81b5c | 1256 | `EMAIL` environment variables. See linkgit:git-commit-tree[1]. |
1ab661dd PB |
1257 | |
1258 | user.name:: | |
1259 | Your full name to be recorded in any newly created commits. | |
eee7f4a2 | 1260 | Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME` |
5162e697 | 1261 | environment variables. See linkgit:git-commit-tree[1]. |
1ab661dd | 1262 | |
4d5c2956 | 1263 | user.useConfigOnly:: |
ae9f6311 TR |
1264 | Instruct Git to avoid trying to guess defaults for `user.email` |
1265 | and `user.name`, and instead retrieve the values only from the | |
4d5c2956 DA |
1266 | configuration. For example, if you have multiple email addresses |
1267 | and would like to use a different one for each repository, then | |
1268 | with this configuration option set to `true` in the global config | |
1269 | along with a name, Git will prompt you to set up an email before | |
1270 | making new commits in a newly cloned repository. | |
1271 | Defaults to `false`. | |
1272 | ||
da0005b8 | 1273 | user.signingKey:: |
f0551693 NV |
1274 | If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the |
1275 | key you want it to automatically when creating a signed tag or | |
1276 | commit, you can override the default selection with this variable. | |
1277 | This option is passed unchanged to gpg's --local-user parameter, | |
1278 | so you may specify a key using any method that gpg supports. | |
d67778ec | 1279 | |
c026557a SG |
1280 | versionsort.prereleaseSuffix (deprecated):: |
1281 | Deprecated alias for `versionsort.suffix`. Ignored if | |
1282 | `versionsort.suffix` is set. | |
1283 | ||
1284 | versionsort.suffix:: | |
1285 | Even when version sort is used in linkgit:git-tag[1], tagnames | |
1286 | with the same base version but different suffixes are still sorted | |
1287 | lexicographically, resulting e.g. in prerelease tags appearing | |
1288 | after the main release (e.g. "1.0-rc1" after "1.0"). This | |
1289 | variable can be specified to determine the sorting order of tags | |
1290 | with different suffixes. | |
1291 | + | |
1292 | By specifying a single suffix in this variable, any tagname containing | |
1293 | that suffix will appear before the corresponding main release. E.g. if | |
1294 | the variable is set to "-rc", then all "1.0-rcX" tags will appear before | |
1295 | "1.0". If specified multiple times, once per suffix, then the order of | |
1296 | suffixes in the configuration will determine the sorting order of tagnames | |
1297 | with those suffixes. E.g. if "-pre" appears before "-rc" in the | |
1298 | configuration, then all "1.0-preX" tags will be listed before any | |
1299 | "1.0-rcX" tags. The placement of the main release tag relative to tags | |
1300 | with various suffixes can be determined by specifying the empty suffix | |
1301 | among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and | |
1302 | "-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags | |
1303 | are listed first, followed by "v4.8", then "v4.8-ckX" and finally | |
1304 | "v4.8-bfsX". | |
1305 | + | |
b8231660 | 1306 | If more than one suffixes match the same tagname, then that tagname will |
51acfa9d SG |
1307 | be sorted according to the suffix which starts at the earliest position in |
1308 | the tagname. If more than one different matching suffixes start at | |
1309 | that earliest position, then that tagname will be sorted according to the | |
1310 | longest of those suffixes. | |
b8231660 SG |
1311 | The sorting order between different suffixes is undefined if they are |
1312 | in multiple config files. | |
d811c8e1 | 1313 | |
983a9eeb CC |
1314 | web.browser:: |
1315 | Specify a web browser that may be used by some commands. | |
1316 | Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] | |
1317 | may use it. | |
e92445a7 TG |
1318 | |
1319 | worktree.guessRemote:: | |
1320 | With `add`, if no branch argument, and neither of `-b` nor | |
1321 | `-B` nor `--detach` are given, the command defaults to | |
1322 | creating a new branch from HEAD. If `worktree.guessRemote` is | |
1323 | set to true, `worktree add` tries to find a remote-tracking | |
1324 | branch whose name uniquely matches the new branch name. If | |
1325 | such a branch exists, it is checked out and set as "upstream" | |
1326 | for the new branch. If no such match can be found, it falls | |
1327 | back to creating a new branch from the current HEAD. |