| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1 | CONFIGURATION FILE |
| 2 | ------------------ |
| 3 | |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 4 | The Git configuration file contains a number of variables that affect |
| 5 | the Git commands' behavior. The `.git/config` file in each repository |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 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 | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 11 | The configuration variables are used by both the Git plumbing |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 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 |
| Junio C Hamano | 81d540a | 2012-03-02 19:52:47 | [diff] [blame] | 15 | dot. The variable names are case-insensitive, allow only alphanumeric |
| 16 | characters and `-`, and must start with an alphabetic character. Some |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 17 | variables may appear multiple times; we say then that the variable is |
| 18 | multivalued. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 19 | |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 20 | Syntax |
| 21 | ~~~~~~ |
| 22 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 23 | The syntax is fairly flexible and permissive; whitespaces are mostly |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 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 |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 29 | section begins. Section names are case-insensitive. Only alphanumeric |
| Junio C Hamano | ea82cff | 2009-03-18 01:54:48 | [diff] [blame] | 30 | characters, `-` and `.` are allowed in section names. Each variable |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 31 | must belong to some section, which means that there must be a section |
| 32 | header before the first setting of a variable. |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 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, |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 36 | in the section header, like in the example below: |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 37 | |
| 38 | -------- |
| 39 | [section "subsection"] |
| 40 | |
| 41 | -------- |
| 42 | |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 43 | Subsection names are case sensitive and can contain any characters except |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 44 | newline (doublequote `"` and backslash can be included by escaping them |
| 45 | as `\"` and `\\`, respectively). Section headers cannot span multiple |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 46 | lines. Variables may belong directly to a section or to a given subsection. |
| 47 | You can have `[section]` if you have `[section "subsection"]`, but you |
| 48 | don't need to. |
| 49 | |
| Junio C Hamano | 6231f82 | 2011-10-24 05:18:52 | [diff] [blame] | 50 | There is also a deprecated `[section.subsection]` syntax. With this |
| 51 | syntax, the subsection name is converted to lower-case and is also |
| 52 | compared case sensitively. These subsection names follow the same |
| 53 | restrictions as section names. |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 54 | |
| Junio C Hamano | aa2cd76 | 2009-07-26 08:14:01 | [diff] [blame] | 55 | All the other lines (and the remainder of the line after the section |
| 56 | header) are recognized as setting variables, in the form |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 57 | 'name = value' (or just 'name', which is a short-hand to say that |
| 58 | the variable is the boolean "true"). |
| Junio C Hamano | 81d540a | 2012-03-02 19:52:47 | [diff] [blame] | 59 | The variable names are case-insensitive, allow only alphanumeric characters |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 60 | and `-`, and must start with an alphabetic character. |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 61 | |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 62 | A line that defines a value can be continued to the next line by |
| 63 | ending it with a `\`; the backquote and the end-of-line are |
| 64 | stripped. Leading whitespaces after 'name =', the remainder of the |
| 65 | line after the first comment character '#' or ';', and trailing |
| 66 | whitespaces of the line are discarded unless they are enclosed in |
| 67 | double quotes. Internal whitespaces within the value are retained |
| 68 | verbatim. |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 69 | |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 70 | Inside double quotes, double quote `"` and backslash `\` characters |
| 71 | must be escaped: use `\"` for `"` and `\\` for `\`. |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 72 | |
| Junio C Hamano | ea82cff | 2009-03-18 01:54:48 | [diff] [blame] | 73 | The following escape sequences (beside `\"` and `\\`) are recognized: |
| 74 | `\n` for newline character (NL), `\t` for horizontal tabulation (HT, TAB) |
| Junio C Hamano | d75148a | 2014-04-08 19:48:38 | [diff] [blame] | 75 | and `\b` for backspace (BS). Other char escape sequences (including octal |
| 76 | escape sequences) are invalid. |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 77 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 78 | |
| Junio C Hamano | e0238c2 | 2012-02-23 22:45:50 | [diff] [blame] | 79 | Includes |
| 80 | ~~~~~~~~ |
| 81 | |
| Junio C Hamano | cb06ef9 | 2017-03-21 22:40:14 | [diff] [blame] | 82 | You can include a config file from another by setting the special |
| Junio C Hamano | e0238c2 | 2012-02-23 22:45:50 | [diff] [blame] | 83 | `include.path` variable to the name of the file to be included. The |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 84 | variable takes a pathname as its value, and is subject to tilde |
| Junio C Hamano | cb06ef9 | 2017-03-21 22:40:14 | [diff] [blame] | 85 | expansion. `include.path` can be given multiple times. |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 86 | |
| Junio C Hamano | cb06ef9 | 2017-03-21 22:40:14 | [diff] [blame] | 87 | The included file is expanded immediately, as if its contents had been |
| Junio C Hamano | e0238c2 | 2012-02-23 22:45:50 | [diff] [blame] | 88 | found at the location of the include directive. If the value of the |
| Junio C Hamano | cb06ef9 | 2017-03-21 22:40:14 | [diff] [blame] | 89 | `include.path` variable is a relative path, the path is considered to |
| 90 | be relative to the configuration file in which the include directive |
| 91 | was found. See below for examples. |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 92 | |
| Junio C Hamano | cb06ef9 | 2017-03-21 22:40:14 | [diff] [blame] | 93 | Conditional includes |
| 94 | ~~~~~~~~~~~~~~~~~~~~ |
| 95 | |
| 96 | You can include a config file from another conditionally by setting a |
| 97 | `includeIf.<condition>.path` variable to the name of the file to be |
| 98 | included. The variable's value is treated the same way as |
| 99 | `include.path`. `includeIf.<condition>.path` can be given multiple times. |
| 100 | |
| 101 | The condition starts with a keyword followed by a colon and some data |
| 102 | whose format and meaning depends on the keyword. Supported keywords |
| 103 | are: |
| 104 | |
| 105 | `gitdir`:: |
| 106 | |
| 107 | The data that follows the keyword `gitdir:` is used as a glob |
| 108 | pattern. If the location of the .git directory matches the |
| 109 | pattern, the include condition is met. |
| 110 | + |
| 111 | The .git location may be auto-discovered, or come from `$GIT_DIR` |
| 112 | environment variable. If the repository is auto discovered via a .git |
| 113 | file (e.g. from submodules, or a linked worktree), the .git location |
| 114 | would be the final location where the .git directory is, not where the |
| 115 | .git file is. |
| 116 | + |
| 117 | The pattern can contain standard globbing wildcards and two additional |
| 118 | ones, `**/` and `/**`, that can match multiple path components. Please |
| 119 | refer to linkgit:gitignore[5] for details. For convenience: |
| 120 | |
| 121 | * If the pattern starts with `~/`, `~` will be substituted with the |
| 122 | content of the environment variable `HOME`. |
| 123 | |
| 124 | * If the pattern starts with `./`, it is replaced with the directory |
| 125 | containing the current config file. |
| 126 | |
| 127 | * If the pattern does not start with either `~/`, `./` or `/`, `**/` |
| 128 | will be automatically prepended. For example, the pattern `foo/bar` |
| 129 | becomes `**/foo/bar` and would match `/any/path/to/foo/bar`. |
| 130 | |
| 131 | * If the pattern ends with `/`, `**` will be automatically added. For |
| 132 | example, the pattern `foo/` becomes `foo/**`. In other words, it |
| 133 | matches "foo" and everything inside, recursively. |
| 134 | |
| 135 | `gitdir/i`:: |
| 136 | This is the same as `gitdir` except that matching is done |
| 137 | case-insensitively (e.g. on case-insensitive file sytems) |
| 138 | |
| 139 | A few more notes on matching via `gitdir` and `gitdir/i`: |
| 140 | |
| 141 | * Symlinks in `$GIT_DIR` are not resolved before matching. |
| 142 | |
| 143 | * Note that "../" is not special and will match literally, which is |
| 144 | unlikely what you want. |
| Junio C Hamano | e0238c2 | 2012-02-23 22:45:50 | [diff] [blame] | 145 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 146 | Example |
| 147 | ~~~~~~~ |
| 148 | |
| 149 | # Core variables |
| 150 | [core] |
| 151 | ; Don't trust file modes |
| 152 | filemode = false |
| 153 | |
| 154 | # Our diff algorithm |
| 155 | [diff] |
| Junio C Hamano | 85c7157 | 2008-07-28 00:03:31 | [diff] [blame] | 156 | external = /usr/local/bin/diff-wrapper |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 157 | renames = true |
| 158 | |
| Junio C Hamano | 52401ef | 2006-12-19 00:54:38 | [diff] [blame] | 159 | [branch "devel"] |
| 160 | remote = origin |
| 161 | merge = refs/heads/devel |
| 162 | |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 163 | # Proxy settings |
| 164 | [core] |
| Junio C Hamano | c71a873 | 2007-08-04 00:27:26 | [diff] [blame] | 165 | gitProxy="ssh" for "kernel.org" |
| Junio C Hamano | bee172f | 2007-01-23 08:44:18 | [diff] [blame] | 166 | gitProxy=default-proxy ; for the rest |
| Junio C Hamano | 52401ef | 2006-12-19 00:54:38 | [diff] [blame] | 167 | |
| Junio C Hamano | e0238c2 | 2012-02-23 22:45:50 | [diff] [blame] | 168 | [include] |
| 169 | path = /path/to/foo.inc ; include by absolute path |
| 170 | path = foo ; expand "foo" relative to the current file |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 171 | path = ~/foo ; expand "foo" in your `$HOME` directory |
| Junio C Hamano | e0238c2 | 2012-02-23 22:45:50 | [diff] [blame] | 172 | |
| Junio C Hamano | cb06ef9 | 2017-03-21 22:40:14 | [diff] [blame] | 173 | ; include if $GIT_DIR is /path/to/foo/.git |
| 174 | [includeIf "gitdir:/path/to/foo/.git"] |
| 175 | path = /path/to/foo.inc |
| 176 | |
| 177 | ; include for all repositories inside /path/to/group |
| 178 | [includeIf "gitdir:/path/to/group/"] |
| 179 | path = /path/to/foo.inc |
| 180 | |
| 181 | ; include for all repositories inside $HOME/to/group |
| 182 | [includeIf "gitdir:~/to/group/"] |
| 183 | path = /path/to/foo.inc |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 184 | |
| 185 | Values |
| 186 | ~~~~~~ |
| 187 | |
| 188 | Values of many variables are treated as a simple string, but there |
| 189 | are variables that take values of specific types and there are rules |
| 190 | as to how to spell them. |
| 191 | |
| 192 | boolean:: |
| 193 | |
| 194 | When a variable is said to take a boolean value, many |
| 195 | synonyms are accepted for 'true' and 'false'; these are all |
| 196 | case-insensitive. |
| 197 | |
| 198 | true;; Boolean true can be spelled as `yes`, `on`, `true`, |
| 199 | or `1`. Also, a variable defined without `= <value>` |
| 200 | is taken as true. |
| 201 | |
| 202 | false;; Boolean false can be spelled as `no`, `off`, |
| 203 | `false`, or `0`. |
| 204 | + |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 205 | When converting value to the canonical form using `--bool` type |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 206 | specifier; 'git config' will ensure that the output is "true" or |
| 207 | "false" (spelled in lowercase). |
| 208 | |
| 209 | integer:: |
| 210 | The value for many variables that specify various sizes can |
| 211 | be suffixed with `k`, `M`,... to mean "scale the number by |
| 212 | 1024", "by 1024x1024", etc. |
| 213 | |
| 214 | color:: |
| Junio C Hamano | 48931e2 | 2016-07-11 20:08:47 | [diff] [blame] | 215 | The value for a variable that takes a color is a list of |
| 216 | colors (at most two, one for foreground and one for background) |
| 217 | and attributes (as many as you want), separated by spaces. |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 218 | + |
| Junio C Hamano | 48931e2 | 2016-07-11 20:08:47 | [diff] [blame] | 219 | The basic colors accepted are `normal`, `black`, `red`, `green`, `yellow`, |
| 220 | `blue`, `magenta`, `cyan` and `white`. The first color given is the |
| 221 | foreground; the second is the background. |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 222 | + |
| Junio C Hamano | 48931e2 | 2016-07-11 20:08:47 | [diff] [blame] | 223 | Colors may also be given as numbers between 0 and 255; these use ANSI |
| 224 | 256-color mode (but note that not all terminals may support this). If |
| 225 | your terminal supports it, you may also specify 24-bit RGB values as |
| 226 | hex, like `#ff0ab3`. |
| 227 | + |
| 228 | The accepted attributes are `bold`, `dim`, `ul`, `blink`, `reverse`, |
| 229 | `italic`, and `strike` (for crossed-out or "strikethrough" letters). |
| 230 | The position of any attributes with respect to the colors |
| 231 | (before, after, or in between), doesn't matter. Specific attributes may |
| 232 | be turned off by prefixing them with `no` or `no-` (e.g., `noreverse`, |
| 233 | `no-ul`, etc). |
| 234 | + |
| Junio C Hamano | b86c803 | 2017-02-02 21:50:19 | [diff] [blame] | 235 | An empty color string produces no color effect at all. This can be used |
| 236 | to avoid coloring specific elements without disabling color entirely. |
| 237 | + |
| Junio C Hamano | 48931e2 | 2016-07-11 20:08:47 | [diff] [blame] | 238 | For git's pre-defined color slots, the attributes are meant to be reset |
| 239 | at the beginning of each item in the colored output. So setting |
| 240 | `color.decorate.branch` to `black` will paint that branch name in a |
| 241 | plain `black`, even if the previous thing on the same output line (e.g. |
| 242 | opening parenthesis before the list of branch names in `log --decorate` |
| 243 | output) is set to be painted with `bold` or some other attribute. |
| 244 | However, custom log formats may do more complicated and layered |
| 245 | coloring, and the negated forms may be useful there. |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 246 | |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 247 | pathname:: |
| 248 | A variable that takes a pathname value can be given a |
| 249 | string that begins with "`~/`" or "`~user/`", and the usual |
| 250 | tilde expansion happens to such a string: `~/` |
| 251 | is expanded to the value of `$HOME`, and `~user/` to the |
| 252 | specified user's home directory. |
| 253 | |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 254 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 255 | Variables |
| 256 | ~~~~~~~~~ |
| 257 | |
| 258 | Note that this list is non-comprehensive and not necessarily complete. |
| Junio C Hamano | f1d1480 | 2006-06-08 00:48:17 | [diff] [blame] | 259 | For command-specific variables, you will find a more detailed description |
| Junio C Hamano | 52b6ba3 | 2014-04-01 00:26:48 | [diff] [blame] | 260 | in the appropriate manual page. |
| 261 | |
| 262 | Other git-related tools may and do use their own variables. When |
| 263 | inventing new variables for use in your own tool, make sure their |
| 264 | names do not conflict with those that are used by Git itself and |
| 265 | other popular tools, and describe them in your documentation. |
| 266 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 267 | |
| Junio C Hamano | 7df6dcf | 2009-09-13 09:51:17 | [diff] [blame] | 268 | advice.*:: |
| Junio C Hamano | 0df9271 | 2011-12-21 22:30:44 | [diff] [blame] | 269 | These variables control various optional help messages designed to |
| 270 | aid new users. All 'advice.*' variables default to 'true', and you |
| 271 | 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] | 272 | + |
| 273 | -- |
| Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 274 | pushUpdateRejected:: |
| Junio C Hamano | 0c1b64e | 2012-04-20 23:50:49 | [diff] [blame] | 275 | Set this variable to 'false' if you want to disable |
| Junio C Hamano | 1d669b8 | 2014-03-11 21:36:00 | [diff] [blame] | 276 | 'pushNonFFCurrent', |
| Junio C Hamano | 3f2ed6f | 2013-02-04 19:24:09 | [diff] [blame] | 277 | 'pushNonFFMatching', 'pushAlreadyExists', |
| 278 | 'pushFetchFirst', and 'pushNeedsForce' |
| Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 279 | simultaneously. |
| Junio C Hamano | 0c1b64e | 2012-04-20 23:50:49 | [diff] [blame] | 280 | pushNonFFCurrent:: |
| 281 | Advice shown when linkgit:git-push[1] fails due to a |
| 282 | non-fast-forward update to the current branch. |
| Junio C Hamano | 0c1b64e | 2012-04-20 23:50:49 | [diff] [blame] | 283 | pushNonFFMatching:: |
| 284 | Advice shown when you ran linkgit:git-push[1] and pushed |
| 285 | 'matching refs' explicitly (i.e. you used ':', or |
| 286 | specified a refspec that isn't your current branch) and |
| 287 | it resulted in a non-fast-forward error. |
| Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 288 | pushAlreadyExists:: |
| 289 | Shown when linkgit:git-push[1] rejects an update that |
| 290 | does not qualify for fast-forwarding (e.g., a tag.) |
| Junio C Hamano | 3f2ed6f | 2013-02-04 19:24:09 | [diff] [blame] | 291 | pushFetchFirst:: |
| 292 | Shown when linkgit:git-push[1] rejects an update that |
| 293 | tries to overwrite a remote ref that points at an |
| 294 | object we do not have. |
| 295 | pushNeedsForce:: |
| 296 | Shown when linkgit:git-push[1] rejects an update that |
| 297 | tries to overwrite a remote ref that points at an |
| Junio C Hamano | e6f28d0 | 2013-09-17 21:34:00 | [diff] [blame] | 298 | object that is not a commit-ish, or make the remote |
| 299 | ref point at an object that is not a commit-ish. |
| Junio C Hamano | 7df6dcf | 2009-09-13 09:51:17 | [diff] [blame] | 300 | statusHints:: |
| Junio C Hamano | 644936c | 2012-06-28 23:05:14 | [diff] [blame] | 301 | Show directions on how to proceed from the current |
| Junio C Hamano | 917cd4f | 2012-12-04 23:41:10 | [diff] [blame] | 302 | state in the output of linkgit:git-status[1], in |
| Junio C Hamano | 644936c | 2012-06-28 23:05:14 | [diff] [blame] | 303 | the template shown when writing commit messages in |
| Junio C Hamano | 917cd4f | 2012-12-04 23:41:10 | [diff] [blame] | 304 | linkgit:git-commit[1], and in the help message shown |
| 305 | by linkgit:git-checkout[1] when switching branch. |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 306 | statusUoption:: |
| 307 | Advise to consider using the `-u` option to linkgit:git-status[1] |
| 308 | when the command takes more than 2 seconds to enumerate untracked |
| 309 | files. |
| Junio C Hamano | 5706e0b | 2009-11-24 10:54:16 | [diff] [blame] | 310 | commitBeforeMerge:: |
| 311 | Advice shown when linkgit:git-merge[1] refuses to |
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 312 | merge to avoid overwriting local changes. |
| Junio C Hamano | a9701f0 | 2010-01-21 00:42:16 | [diff] [blame] | 313 | resolveConflict:: |
| Junio C Hamano | 5dab5a9 | 2013-02-25 18:51:24 | [diff] [blame] | 314 | Advice shown by various commands when conflicts |
| Junio C Hamano | a9701f0 | 2010-01-21 00:42:16 | [diff] [blame] | 315 | prevent the operation from being performed. |
| Junio C Hamano | a9701f0 | 2010-01-21 00:42:16 | [diff] [blame] | 316 | implicitIdentity:: |
| 317 | Advice on how to set your identity configuration when |
| 318 | your information is guessed from the system username and |
| Junio C Hamano | 0df9271 | 2011-12-21 22:30:44 | [diff] [blame] | 319 | domain name. |
| Junio C Hamano | 74a198f | 2010-02-22 00:13:31 | [diff] [blame] | 320 | detachedHead:: |
| Junio C Hamano | 0df9271 | 2011-12-21 22:30:44 | [diff] [blame] | 321 | Advice shown when you used linkgit:git-checkout[1] to |
| Junio C Hamano | 74a198f | 2010-02-22 00:13:31 | [diff] [blame] | 322 | move to the detach HEAD state, to instruct how to create |
| Junio C Hamano | 0df9271 | 2011-12-21 22:30:44 | [diff] [blame] | 323 | a local branch after the fact. |
| Junio C Hamano | bb30064 | 2012-07-22 21:09:14 | [diff] [blame] | 324 | amWorkDir:: |
| 325 | Advice that shows the location of the patch file when |
| 326 | linkgit:git-am[1] fails to apply it. |
| Junio C Hamano | 8ab9494 | 2013-06-24 21:55:30 | [diff] [blame] | 327 | rmHints:: |
| 328 | In case of failure in the output of linkgit:git-rm[1], |
| 329 | show directions on how to proceed from the current state. |
| Junio C Hamano | 7df6dcf | 2009-09-13 09:51:17 | [diff] [blame] | 330 | -- |
| 331 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 332 | core.fileMode:: |
| Junio C Hamano | d2c2848 | 2014-10-24 22:28:25 | [diff] [blame] | 333 | Tells Git if the executable bit of files in the working tree |
| 334 | is to be honored. |
| Junio C Hamano | 9df0c66 | 2009-11-23 11:09:27 | [diff] [blame] | 335 | + |
| Junio C Hamano | d2c2848 | 2014-10-24 22:28:25 | [diff] [blame] | 336 | Some filesystems lose the executable bit when a file that is |
| 337 | marked as executable is checked out, or checks out an |
| 338 | non-executable file with executable bit on. |
| 339 | linkgit:git-clone[1] or linkgit:git-init[1] probe the filesystem |
| 340 | to see if it handles the executable bit correctly |
| 341 | and this variable is automatically set as necessary. |
| 342 | + |
| 343 | A repository, however, may be on a filesystem that handles |
| 344 | the filemode correctly, and this variable is set to 'true' |
| 345 | when created, but later may be made accessible from another |
| 346 | environment that loses the filemode (e.g. exporting ext4 via |
| 347 | CIFS mount, visiting a Cygwin created repository with |
| 348 | Git for Windows or Eclipse). |
| 349 | In such a case it may be necessary to set this variable to 'false'. |
| 350 | See linkgit:git-update-index[1]. |
| 351 | + |
| 352 | The default is true (when core.filemode is not specified in the config file). |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 353 | |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 354 | core.hideDotFiles:: |
| 355 | (Windows-only) If true, mark newly-created directories and files whose |
| 356 | name starts with a dot as hidden. If 'dotGitOnly', only the `.git/` |
| 357 | directory is hidden, but no other files starting with a dot. The |
| 358 | default mode is 'dotGitOnly'. |
| 359 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 360 | core.ignoreCase:: |
| Junio C Hamano | 9df0c66 | 2009-11-23 11:09:27 | [diff] [blame] | 361 | If true, this option enables various workarounds to enable |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 362 | Git to work better on filesystems that are not case sensitive, |
| Junio C Hamano | 9df0c66 | 2009-11-23 11:09:27 | [diff] [blame] | 363 | like FAT. For example, if a directory listing finds |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 364 | "makefile" when Git expects "Makefile", Git will assume |
| Junio C Hamano | 9df0c66 | 2009-11-23 11:09:27 | [diff] [blame] | 365 | it is really the same file, and continue to remember it as |
| 366 | "Makefile". |
| 367 | + |
| 368 | The default is false, except linkgit:git-clone[1] or linkgit:git-init[1] |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 369 | will probe and set core.ignoreCase true if appropriate when the repository |
| Junio C Hamano | 9df0c66 | 2009-11-23 11:09:27 | [diff] [blame] | 370 | is created. |
| 371 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 372 | core.precomposeUnicode:: |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 373 | This option is only used by Mac OS implementation of Git. |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 374 | When core.precomposeUnicode=true, Git reverts the unicode decomposition |
| Junio C Hamano | b61a777 | 2012-07-13 23:34:48 | [diff] [blame] | 375 | of filenames done by Mac OS. This is useful when sharing a repository |
| 376 | between Mac OS and Linux or Windows. |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 377 | (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7). |
| 378 | When false, file names are handled fully transparent by Git, |
| 379 | which is backward compatible with older versions of Git. |
| Junio C Hamano | b61a777 | 2012-07-13 23:34:48 | [diff] [blame] | 380 | |
| Junio C Hamano | 30758bd | 2014-12-18 20:44:14 | [diff] [blame] | 381 | core.protectHFS:: |
| 382 | If set to true, do not allow checkout of paths that would |
| 383 | be considered equivalent to `.git` on an HFS+ filesystem. |
| 384 | Defaults to `true` on Mac OS, and `false` elsewhere. |
| 385 | |
| 386 | core.protectNTFS:: |
| 387 | If set to true, do not allow checkout of paths that would |
| 388 | cause problems with the NTFS filesystem, e.g. conflict with |
| 389 | 8.3 "short" names. |
| 390 | Defaults to `true` on Windows, and `false` elsewhere. |
| 391 | |
| Junio C Hamano | 90ccff3 | 2008-07-29 08:17:24 | [diff] [blame] | 392 | core.trustctime:: |
| 393 | If false, the ctime differences between the index and the |
| Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 394 | working tree are ignored; useful when the inode change time |
| Junio C Hamano | 90ccff3 | 2008-07-29 08:17:24 | [diff] [blame] | 395 | is regularly modified by something outside Git (file system |
| 396 | crawlers and some backup systems). |
| 397 | See linkgit:git-update-index[1]. True by default. |
| 398 | |
| Junio C Hamano | 3d4a66d | 2017-03-17 21:07:26 | [diff] [blame] | 399 | core.splitIndex:: |
| 400 | If true, the split-index feature of the index will be used. |
| 401 | See linkgit:git-update-index[1]. False by default. |
| 402 | |
| Junio C Hamano | 9099a7c | 2016-02-10 23:42:05 | [diff] [blame] | 403 | core.untrackedCache:: |
| 404 | Determines what to do about the untracked cache feature of the |
| 405 | index. It will be kept, if this variable is unset or set to |
| 406 | `keep`. It will automatically be added if set to `true`. And |
| 407 | it will automatically be removed, if set to `false`. Before |
| 408 | setting it to `true`, you should check that mtime is working |
| 409 | properly on your system. |
| 410 | See linkgit:git-update-index[1]. `keep` by default. |
| 411 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 412 | core.checkStat:: |
| Junio C Hamano | 4cfed0c | 2013-01-30 17:58:54 | [diff] [blame] | 413 | Determines which stat fields to match between the index |
| 414 | and work tree. The user can set this to 'default' or |
| 415 | 'minimal'. Default (or explicitly 'default'), is to check |
| 416 | all fields, including the sub-second part of mtime and ctime. |
| 417 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 418 | core.quotePath:: |
| Junio C Hamano | 0f6f3bf | 2017-03-13 07:01:53 | [diff] [blame] | 419 | Commands that output paths (e.g. 'ls-files', 'diff'), will |
| 420 | quote "unusual" characters in the pathname by enclosing the |
| 421 | pathname in double-quotes and escaping those characters with |
| 422 | backslashes in the same way C escapes control characters (e.g. |
| 423 | `\t` for TAB, `\n` for LF, `\\` for backslash) or bytes with |
| 424 | values larger than 0x80 (e.g. octal `\302\265` for "micro" in |
| 425 | UTF-8). If this variable is set to false, bytes higher than |
| 426 | 0x80 are not considered "unusual" any more. Double-quotes, |
| 427 | backslash and control characters are always escaped regardless |
| 428 | of the setting of this variable. A simple space character is |
| 429 | not considered "unusual". Many commands can output pathnames |
| 430 | completely verbatim using the `-z` option. The default value |
| 431 | is true. |
| Junio C Hamano | d526ba9 | 2007-07-02 00:17:42 | [diff] [blame] | 432 | |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 433 | core.eol:: |
| 434 | Sets the line ending type to use in the working directory for |
| Junio C Hamano | f2a3a75 | 2016-05-23 22:54:39 | [diff] [blame] | 435 | files that have the `text` property set when core.autocrlf is false. |
| 436 | Alternatives are 'lf', 'crlf' and 'native', which uses the platform's |
| 437 | native line ending. The default value is `native`. See |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 438 | linkgit:gitattributes[5] for more information on end-of-line |
| 439 | conversion. |
| Junio C Hamano | d9e0e5d | 2007-04-14 16:22:04 | [diff] [blame] | 440 | |
| Junio C Hamano | 26e590a | 2008-02-17 03:53:51 | [diff] [blame] | 441 | core.safecrlf:: |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 442 | If true, makes Git check if converting `CRLF` is reversible when |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 443 | end-of-line conversion is active. Git will verify if a command |
| Junio C Hamano | 26e590a | 2008-02-17 03:53:51 | [diff] [blame] | 444 | modifies a file in the work tree either directly or indirectly. |
| 445 | For example, committing a file followed by checking out the |
| 446 | same file should yield the original file in the work tree. If |
| 447 | this is not the case for the current setting of |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 448 | `core.autocrlf`, Git will reject the file. The variable can |
| 449 | be set to "warn", in which case Git will only warn about an |
| Junio C Hamano | 26e590a | 2008-02-17 03:53:51 | [diff] [blame] | 450 | irreversible conversion but continue the operation. |
| 451 | + |
| 452 | CRLF conversion bears a slight chance of corrupting data. |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 453 | 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] | 454 | CRLF during checkout. A file that contains a mixture of LF and |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 455 | CRLF before the commit cannot be recreated by Git. For text |
| Junio C Hamano | 26e590a | 2008-02-17 03:53:51 | [diff] [blame] | 456 | files this is the right thing to do: it corrects line endings |
| 457 | such that we have only LF line endings in the repository. |
| 458 | But for binary files that are accidentally classified as text the |
| 459 | conversion can corrupt data. |
| 460 | + |
| 461 | If you recognize such corruption early you can easily fix it by |
| 462 | setting the conversion type explicitly in .gitattributes. Right |
| 463 | after committing you still have the original file in your work |
| 464 | tree and this file is not yet corrupted. You can explicitly tell |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 465 | Git that this file is binary and Git will handle the file |
| Junio C Hamano | 26e590a | 2008-02-17 03:53:51 | [diff] [blame] | 466 | appropriately. |
| 467 | + |
| 468 | Unfortunately, the desired effect of cleaning up text files with |
| 469 | mixed line endings and the undesired effect of corrupting binary |
| 470 | files cannot be distinguished. In both cases CRLFs are removed |
| 471 | in an irreversible way. For text files this is the right thing |
| 472 | to do because CRLFs are line endings, while for binary files |
| 473 | converting CRLFs corrupts data. |
| 474 | + |
| 475 | Note, this safety check does not mean that a checkout will generate a |
| 476 | file identical to the original file for a different setting of |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 477 | `core.eol` and `core.autocrlf`, but only for the current one. For |
| 478 | example, a text file with `LF` would be accepted with `core.eol=lf` |
| 479 | 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] | 480 | resulting file would contain `CRLF`, although the original file |
| 481 | contained `LF`. However, in both work trees the line endings would be |
| 482 | consistent, that is either all `LF` or all `CRLF`, but never mixed. A |
| 483 | file with mixed line endings would be reported by the `core.safecrlf` |
| 484 | mechanism. |
| 485 | |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 486 | core.autocrlf:: |
| Junio C Hamano | eed15af | 2016-07-25 22:49:42 | [diff] [blame] | 487 | Setting this variable to "true" is the same as setting |
| 488 | the `text` attribute to "auto" on all files and core.eol to "crlf". |
| 489 | Set to true if you want to have `CRLF` line endings in your |
| 490 | working directory and the repository has LF line endings. |
| 491 | This variable can be set to 'input', |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 492 | in which case no output conversion is performed. |
| 493 | |
| Junio C Hamano | aa83a7d | 2007-03-05 02:37:29 | [diff] [blame] | 494 | core.symlinks:: |
| 495 | If false, symbolic links are checked out as small plain files that |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 496 | contain the link text. linkgit:git-update-index[1] and |
| 497 | linkgit:git-add[1] will not change the recorded type to regular |
| Junio C Hamano | aa83a7d | 2007-03-05 02:37:29 | [diff] [blame] | 498 | file. Useful on filesystems like FAT that do not support |
| Junio C Hamano | 9df0c66 | 2009-11-23 11:09:27 | [diff] [blame] | 499 | symbolic links. |
| 500 | + |
| 501 | The default is true, except linkgit:git-clone[1] or linkgit:git-init[1] |
| 502 | will probe and set core.symlinks false if appropriate when the repository |
| 503 | is created. |
| Junio C Hamano | aa83a7d | 2007-03-05 02:37:29 | [diff] [blame] | 504 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 505 | core.gitProxy:: |
| 506 | A "proxy command" to execute (as 'command host port') instead |
| 507 | of establishing direct connection to the remote server when |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 508 | using the Git protocol for fetching. If the variable value is |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 509 | in the "COMMAND for DOMAIN" format, the command is applied only |
| 510 | on hostnames ending with the specified domain string. This variable |
| 511 | may be set multiple times and is matched in the given order; |
| 512 | the first match wins. |
| Junio C Hamano | f1d1480 | 2006-06-08 00:48:17 | [diff] [blame] | 513 | + |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 514 | Can be overridden by the `GIT_PROXY_COMMAND` environment variable |
| Junio C Hamano | f1d1480 | 2006-06-08 00:48:17 | [diff] [blame] | 515 | (which always applies universally, without the special "for" |
| 516 | handling). |
| Junio C Hamano | ea82cff | 2009-03-18 01:54:48 | [diff] [blame] | 517 | + |
| 518 | The special string `none` can be used as the proxy command to |
| 519 | specify that no proxy be used for a given domain pattern. |
| 520 | This is useful for excluding servers inside a firewall from |
| 521 | proxy use, while defaulting to a common proxy for external domains. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 522 | |
| Junio C Hamano | 1a1b847 | 2016-07-19 21:37:13 | [diff] [blame] | 523 | core.sshCommand:: |
| 524 | If this variable is set, `git fetch` and `git push` will |
| 525 | use the specified command instead of `ssh` when they need to |
| 526 | connect to a remote system. The command is in the same form as |
| 527 | the `GIT_SSH_COMMAND` environment variable and is overridden |
| 528 | when the environment variable is set. |
| 529 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 530 | core.ignoreStat:: |
| Junio C Hamano | e8acc8e | 2015-01-14 22:01:34 | [diff] [blame] | 531 | If true, Git will avoid using lstat() calls to detect if files have |
| 532 | changed by setting the "assume-unchanged" bit for those tracked files |
| 533 | which it has updated identically in both the index and working tree. |
| 534 | + |
| 535 | When files are modified outside of Git, the user will need to stage |
| 536 | the modified files explicitly (e.g. see 'Examples' section in |
| 537 | linkgit:git-update-index[1]). |
| 538 | Git will not normally detect changes to those files. |
| 539 | + |
| 540 | This is useful on systems where lstat() calls are very slow, such as |
| 541 | CIFS/Microsoft Windows. |
| 542 | + |
| 543 | False by default. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 544 | |
| Junio C Hamano | 88a3a07 | 2006-05-04 08:01:43 | [diff] [blame] | 545 | core.preferSymlinkRefs:: |
| 546 | Instead of the default "symref" format for HEAD |
| 547 | and other symbolic reference files, use symbolic links. |
| 548 | This is sometimes needed to work with old scripts that |
| 549 | expect HEAD to be a symbolic link. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 550 | |
| Junio C Hamano | 1025e75 | 2007-02-23 07:21:26 | [diff] [blame] | 551 | core.bare:: |
| 552 | If true this repository is assumed to be 'bare' and has no |
| 553 | working directory associated with it. If this is the case a |
| 554 | number of commands that require a working directory will be |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 555 | disabled, such as linkgit:git-add[1] or linkgit:git-merge[1]. |
| Junio C Hamano | 1025e75 | 2007-02-23 07:21:26 | [diff] [blame] | 556 | + |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 557 | This setting is automatically guessed by linkgit:git-clone[1] or |
| 558 | linkgit:git-init[1] when the repository was created. By default a |
| Junio C Hamano | 1025e75 | 2007-02-23 07:21:26 | [diff] [blame] | 559 | repository that ends in "/.git" is assumed to be not bare (bare = |
| 560 | false), while all other repositories are assumed to be bare (bare |
| 561 | = true). |
| 562 | |
| Junio C Hamano | d526ba9 | 2007-07-02 00:17:42 | [diff] [blame] | 563 | core.worktree:: |
| Junio C Hamano | 80d5846 | 2011-01-24 22:52:52 | [diff] [blame] | 564 | Set the path to the root of the working tree. |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 565 | If `GIT_COMMON_DIR` environment variable is set, core.worktree |
| Junio C Hamano | 4cc4a84 | 2015-05-11 22:41:02 | [diff] [blame] | 566 | is ignored and not used for determining the root of working tree. |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 567 | This can be overridden by the `GIT_WORK_TREE` environment |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 568 | variable and the `--work-tree` command-line option. |
| Junio C Hamano | 5cd1518 | 2011-04-05 00:21:10 | [diff] [blame] | 569 | 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] | 570 | the .git directory, which is either specified by --git-dir |
| 571 | or GIT_DIR, or automatically discovered. |
| 572 | If --git-dir or GIT_DIR is specified but none of |
| Junio C Hamano | 7d575a5 | 2008-04-30 08:45:27 | [diff] [blame] | 573 | --work-tree, GIT_WORK_TREE and core.worktree is specified, |
| Junio C Hamano | 80d5846 | 2011-01-24 22:52:52 | [diff] [blame] | 574 | the current working directory is regarded as the top level |
| Junio C Hamano | 3609b33 | 2010-12-29 01:34:52 | [diff] [blame] | 575 | of your working tree. |
| Junio C Hamano | 80d5846 | 2011-01-24 22:52:52 | [diff] [blame] | 576 | + |
| 577 | Note that this variable is honored even when set in a configuration |
| 578 | file in a ".git" subdirectory of a directory and its value differs |
| 579 | from the latter directory (e.g. "/path/to/.git/config" has |
| 580 | core.worktree set to "/different/path"), which is most likely a |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 581 | misconfiguration. Running Git commands in the "/path/to" directory will |
| Junio C Hamano | 80d5846 | 2011-01-24 22:52:52 | [diff] [blame] | 582 | still use "/different/path" as the root of the work tree and can cause |
| 583 | confusion unless you know what you are doing (e.g. you are creating a |
| 584 | read-only snapshot of the same index to a location different from the |
| 585 | repository's usual working tree). |
| Junio C Hamano | d526ba9 | 2007-07-02 00:17:42 | [diff] [blame] | 586 | |
| Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 587 | core.logAllRefUpdates:: |
| Junio C Hamano | cae8627 | 2007-08-21 02:20:49 | [diff] [blame] | 588 | Enable the reflog. Updates to a ref <ref> is logged to the file |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 589 | "`$GIT_DIR/logs/<ref>`", by appending the new and old |
| Junio C Hamano | e3f080d | 2013-04-22 02:27:13 | [diff] [blame] | 590 | SHA-1, the date/time and the reason of the update, but |
| Junio C Hamano | a2ec14f | 2006-11-02 00:22:48 | [diff] [blame] | 591 | only when the file exists. If this configuration |
| Junio C Hamano | a8e4261 | 2017-02-03 21:44:07 | [diff] [blame] | 592 | variable is set to `true`, missing "`$GIT_DIR/logs/<ref>`" |
| Junio C Hamano | 15567bc | 2011-07-23 00:51:59 | [diff] [blame] | 593 | file is automatically created for branch heads (i.e. under |
| Junio C Hamano | a8e4261 | 2017-02-03 21:44:07 | [diff] [blame] | 594 | `refs/heads/`), remote refs (i.e. under `refs/remotes/`), |
| 595 | note refs (i.e. under `refs/notes/`), and the symbolic ref `HEAD`. |
| 596 | If it is set to `always`, then a missing reflog is automatically |
| 597 | created for any ref under `refs/`. |
| Junio C Hamano | 1caaf47 | 2006-12-31 08:29:35 | [diff] [blame] | 598 | + |
| 599 | This information can be used to determine what commit |
| 600 | was the tip of a branch "2 days ago". |
| 601 | + |
| 602 | This value is true by default in a repository that has |
| 603 | a working directory associated with it, and false by |
| 604 | default in a bare repository. |
| Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 605 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 606 | core.repositoryFormatVersion:: |
| 607 | Internal variable identifying the repository format and layout |
| 608 | version. |
| 609 | |
| 610 | core.sharedRepository:: |
| Junio C Hamano | 0ab78ae | 2006-08-09 01:00:42 | [diff] [blame] | 611 | When 'group' (or 'true'), the repository is made shareable between |
| 612 | several users in a group (making sure all the files and objects are |
| 613 | group-writable). When 'all' (or 'world' or 'everybody'), the |
| 614 | repository will be readable by all users, additionally to being |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 615 | group-shareable. When 'umask' (or 'false'), Git will use permissions |
| Junio C Hamano | 2f102bb | 2008-04-26 02:23:37 | [diff] [blame] | 616 | reported by umask(2). When '0xxx', where '0xxx' is an octal number, |
| 617 | files in the repository will have this mode value. '0xxx' will override |
| Junio C Hamano | 83eded1 | 2009-04-20 08:18:00 | [diff] [blame] | 618 | user's umask value (whereas the other options will only override |
| 619 | requested parts of the user's umask value). Examples: '0660' will make |
| 620 | the repo read/write-able for the owner and group, but inaccessible to |
| 621 | 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] | 622 | repository that is group-readable but not group-writable. |
| 623 | See linkgit:git-init[1]. False by default. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 624 | |
| 625 | core.warnAmbiguousRefs:: |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 626 | If true, Git will warn you if the ref name you passed it is ambiguous |
| Junio C Hamano | 947ab82 | 2013-03-19 23:07:29 | [diff] [blame] | 627 | and might match multiple refs in the repository. True by default. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 628 | |
| Junio C Hamano | 7ec1572 | 2006-07-07 02:03:59 | [diff] [blame] | 629 | core.compression:: |
| Junio C Hamano | f2ce297 | 2007-05-20 19:12:09 | [diff] [blame] | 630 | An integer -1..9, indicating a default compression level. |
| 631 | -1 is the zlib default. 0 means no compression, |
| 632 | and 1..9 are various speed/size tradeoffs, 9 being slowest. |
| Junio C Hamano | 2e72a94 | 2007-11-21 08:54:42 | [diff] [blame] | 633 | If set, this provides a default to other compression variables, |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 634 | such as `core.looseCompression` and `pack.compression`. |
| Junio C Hamano | a126a3b | 2006-07-04 04:55:26 | [diff] [blame] | 635 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 636 | core.looseCompression:: |
| Junio C Hamano | f2ce297 | 2007-05-20 19:12:09 | [diff] [blame] | 637 | An integer -1..9, indicating the compression level for objects that |
| 638 | are not in a pack file. -1 is the zlib default. 0 means no |
| 639 | compression, and 1..9 are various speed/size tradeoffs, 9 being |
| 640 | slowest. If not set, defaults to core.compression. If that is |
| Junio C Hamano | 2e72a94 | 2007-11-21 08:54:42 | [diff] [blame] | 641 | not set, defaults to 1 (best speed). |
| Junio C Hamano | 28d9dfe | 2006-07-25 03:50:49 | [diff] [blame] | 642 | |
| Junio C Hamano | fc4d38c | 2007-01-08 06:53:32 | [diff] [blame] | 643 | core.packedGitWindowSize:: |
| 644 | Number of bytes of a pack file to map into memory in a |
| 645 | single mapping operation. Larger window sizes may allow |
| 646 | your system to process a smaller number of large pack files |
| 647 | more quickly. Smaller window sizes will negatively affect |
| 648 | performance due to increased calls to the operating system's |
| 649 | memory manager, but may improve performance when accessing |
| 650 | a large number of large pack files. |
| 651 | + |
| 652 | Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32 |
| 653 | MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should |
| 654 | be reasonable for all users/operating systems. You probably do |
| 655 | not need to adjust this value. |
| 656 | + |
| 657 | Common unit suffixes of 'k', 'm', or 'g' are supported. |
| 658 | |
| 659 | core.packedGitLimit:: |
| 660 | Maximum number of bytes to map simultaneously into memory |
| 661 | from pack files. If Git needs to access more than this many |
| 662 | bytes at once to complete an operation it will unmap existing |
| 663 | regions to reclaim virtual address space within the process. |
| 664 | + |
| 665 | Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms. |
| 666 | This should be reasonable for all users/operating systems, except on |
| 667 | the largest projects. You probably do not need to adjust this value. |
| 668 | + |
| 669 | Common unit suffixes of 'k', 'm', or 'g' are supported. |
| 670 | |
| Junio C Hamano | b8c5128 | 2007-03-19 10:43:30 | [diff] [blame] | 671 | core.deltaBaseCacheLimit:: |
| 672 | Maximum number of bytes to reserve for caching base objects |
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 673 | that may be referenced by multiple deltified objects. By storing the |
| Junio C Hamano | b8c5128 | 2007-03-19 10:43:30 | [diff] [blame] | 674 | entire decompressed base objects in a cache Git is able |
| 675 | to avoid unpacking and decompressing frequently used base |
| 676 | objects multiple times. |
| 677 | + |
| Junio C Hamano | e1aeb5e | 2014-06-06 19:16:29 | [diff] [blame] | 678 | Default is 96 MiB on all platforms. This should be reasonable |
| Junio C Hamano | b8c5128 | 2007-03-19 10:43:30 | [diff] [blame] | 679 | for all users/operating systems, except on the largest projects. |
| 680 | You probably do not need to adjust this value. |
| 681 | + |
| 682 | Common unit suffixes of 'k', 'm', or 'g' are supported. |
| 683 | |
| Junio C Hamano | 5c246f2 | 2010-02-03 07:34:53 | [diff] [blame] | 684 | core.bigFileThreshold:: |
| 685 | Files larger than this size are stored deflated, without |
| 686 | attempting delta compression. Storing large files without |
| 687 | delta compression avoids excessive memory usage, at the |
| Junio C Hamano | 8e61f1f | 2014-09-11 21:53:45 | [diff] [blame] | 688 | slight expense of increased disk usage. Additionally files |
| 689 | larger than this size are always treated as binary. |
| Junio C Hamano | 5c246f2 | 2010-02-03 07:34:53 | [diff] [blame] | 690 | + |
| 691 | Default is 512 MiB on all platforms. This should be reasonable |
| 692 | for most projects as source code and other text files can still |
| 693 | be delta compressed, but larger binary media files won't be. |
| 694 | + |
| 695 | Common unit suffixes of 'k', 'm', or 'g' are supported. |
| Junio C Hamano | 5c246f2 | 2010-02-03 07:34:53 | [diff] [blame] | 696 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 697 | core.excludesFile:: |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 698 | Specifies the pathname to the file that contains patterns to |
| 699 | describe paths that are not meant to be tracked, in addition |
| 700 | to '.gitignore' (per-directory) and '.git/info/exclude'. |
| 701 | Defaults to `$XDG_CONFIG_HOME/git/ignore`. |
| 702 | If `$XDG_CONFIG_HOME` is either not set or empty, `$HOME/.config/git/ignore` |
| Junio C Hamano | 8edb4c7 | 2012-07-09 20:33:55 | [diff] [blame] | 703 | is used instead. See linkgit:gitignore[5]. |
| Junio C Hamano | 5e284b4 | 2007-05-22 07:23:37 | [diff] [blame] | 704 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 705 | core.askPass:: |
| Junio C Hamano | 3fd7b26 | 2010-09-08 22:44:20 | [diff] [blame] | 706 | Some commands (e.g. svn and http interfaces) that interactively |
| 707 | ask for a password can be told to use an external program given |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 708 | via the value of this variable. Can be overridden by the `GIT_ASKPASS` |
| Junio C Hamano | 3fd7b26 | 2010-09-08 22:44:20 | [diff] [blame] | 709 | environment variable. If not set, fall back to the value of the |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 710 | `SSH_ASKPASS` environment variable or, failing that, a simple password |
| Junio C Hamano | 3fd7b26 | 2010-09-08 22:44:20 | [diff] [blame] | 711 | prompt. The external program shall be given a suitable prompt as |
| Junio C Hamano | e1aeb5e | 2014-06-06 19:16:29 | [diff] [blame] | 712 | command-line argument and write the password on its STDOUT. |
| Junio C Hamano | 3fd7b26 | 2010-09-08 22:44:20 | [diff] [blame] | 713 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 714 | core.attributesFile:: |
| Junio C Hamano | 3b4609d | 2010-09-30 00:04:34 | [diff] [blame] | 715 | In addition to '.gitattributes' (per-directory) and |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 716 | '.git/info/attributes', Git looks into this file for attributes |
| Junio C Hamano | 3b4609d | 2010-09-30 00:04:34 | [diff] [blame] | 717 | (see linkgit:gitattributes[5]). Path expansions are made the same |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 718 | way as for `core.excludesFile`. Its default value is |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 719 | `$XDG_CONFIG_HOME/git/attributes`. If `$XDG_CONFIG_HOME` is either not |
| 720 | set or empty, `$HOME/.config/git/attributes` is used instead. |
| 721 | |
| 722 | core.hooksPath:: |
| 723 | By default Git will look for your hooks in the |
| 724 | '$GIT_DIR/hooks' directory. Set this to different path, |
| 725 | e.g. '/etc/git/hooks', and Git will try to find your hooks in |
| 726 | that directory, e.g. '/etc/git/hooks/pre-receive' instead of |
| 727 | in '$GIT_DIR/hooks/pre-receive'. |
| 728 | + |
| 729 | The path can be either absolute or relative. A relative path is |
| 730 | taken as relative to the directory where the hooks are run (see |
| 731 | the "DESCRIPTION" section of linkgit:githooks[5]). |
| 732 | + |
| 733 | This configuration variable is useful in cases where you'd like to |
| 734 | centrally configure your Git hooks instead of configuring them on a |
| 735 | per-repository basis, or as a more flexible and centralized |
| 736 | alternative to having an `init.templateDir` where you've changed |
| 737 | default hooks. |
| Junio C Hamano | 3b4609d | 2010-09-30 00:04:34 | [diff] [blame] | 738 | |
| Junio C Hamano | f6002a9 | 2007-07-20 10:28:22 | [diff] [blame] | 739 | core.editor:: |
| Junio C Hamano | 7ab74c4 | 2017-03-27 18:23:59 | [diff] [blame] | 740 | Commands such as `commit` and `tag` that let you edit |
| 741 | messages by launching an editor use the value of this |
| Junio C Hamano | f6002a9 | 2007-07-20 10:28:22 | [diff] [blame] | 742 | variable when it is set, and the environment variable |
| Junio C Hamano | 3b70d3c | 2009-11-21 17:37:37 | [diff] [blame] | 743 | `GIT_EDITOR` is not set. See linkgit:git-var[1]. |
| Junio C Hamano | f6002a9 | 2007-07-20 10:28:22 | [diff] [blame] | 744 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 745 | core.commentChar:: |
| Junio C Hamano | 7ab74c4 | 2017-03-27 18:23:59 | [diff] [blame] | 746 | Commands such as `commit` and `tag` that let you edit |
| Junio C Hamano | 3f2ed6f | 2013-02-04 19:24:09 | [diff] [blame] | 747 | messages consider a line that begins with this character |
| 748 | commented, and removes them after the editor returns |
| 749 | (default '#'). |
| Junio C Hamano | e1aeb5e | 2014-06-06 19:16:29 | [diff] [blame] | 750 | + |
| 751 | If set to "auto", `git-commit` would select a character that is not |
| 752 | the beginning character of any line in existing commit messages. |
| Junio C Hamano | 3f2ed6f | 2013-02-04 19:24:09 | [diff] [blame] | 753 | |
| Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 754 | core.packedRefsTimeout:: |
| 755 | The length of time, in milliseconds, to retry when trying to |
| 756 | lock the `packed-refs` file. Value 0 means not to retry at |
| 757 | all; -1 means to try indefinitely. Default is 1000 (i.e., |
| 758 | retry for 1 second). |
| 759 | |
| Junio C Hamano | 6231f82 | 2011-10-24 05:18:52 | [diff] [blame] | 760 | sequence.editor:: |
| Junio C Hamano | 778a341 | 2013-03-28 23:24:30 | [diff] [blame] | 761 | Text editor used by `git rebase -i` for editing the rebase instruction file. |
| Junio C Hamano | 6231f82 | 2011-10-24 05:18:52 | [diff] [blame] | 762 | The value is meant to be interpreted by the shell when it is used. |
| 763 | It can be overridden by the `GIT_SEQUENCE_EDITOR` environment variable. |
| 764 | When not configured the default commit message editor is used instead. |
| 765 | |
| Junio C Hamano | 28d8ede | 2007-07-05 05:51:38 | [diff] [blame] | 766 | core.pager:: |
| Junio C Hamano | 0e0e0d2 | 2013-09-12 23:25:03 | [diff] [blame] | 767 | Text viewer for use by Git commands (e.g., 'less'). The value |
| 768 | is meant to be interpreted by the shell. The order of preference |
| 769 | is the `$GIT_PAGER` environment variable, then `core.pager` |
| 770 | configuration, then `$PAGER`, and then the default chosen at |
| 771 | compile time (usually 'less'). |
| 772 | + |
| Junio C Hamano | e1aeb5e | 2014-06-06 19:16:29 | [diff] [blame] | 773 | When the `LESS` environment variable is unset, Git sets it to `FRX` |
| Junio C Hamano | 0e0e0d2 | 2013-09-12 23:25:03 | [diff] [blame] | 774 | (if `LESS` environment variable is set, Git does not change it at |
| 775 | all). If you want to selectively override Git's default setting |
| Junio C Hamano | e1aeb5e | 2014-06-06 19:16:29 | [diff] [blame] | 776 | for `LESS`, you can set `core.pager` to e.g. `less -S`. This will |
| Junio C Hamano | 0e0e0d2 | 2013-09-12 23:25:03 | [diff] [blame] | 777 | be passed to the shell by Git, which will translate the final |
| Junio C Hamano | e1aeb5e | 2014-06-06 19:16:29 | [diff] [blame] | 778 | command to `LESS=FRX less -S`. The environment does not set the |
| 779 | `S` option but the command line does, instructing less to truncate |
| 780 | long lines. Similarly, setting `core.pager` to `less -+F` will |
| 781 | deactivate the `F` option specified by the environment from the |
| 782 | command-line, deactivating the "quit if one screen" behavior of |
| 783 | `less`. One can specifically activate some flags for particular |
| 784 | commands: for example, setting `pager.blame` to `less -S` enables |
| 785 | line truncation only for `git blame`. |
| Junio C Hamano | bc8d478 | 2014-01-13 23:35:50 | [diff] [blame] | 786 | + |
| 787 | Likewise, when the `LV` environment variable is unset, Git sets it |
| 788 | to `-c`. You can override this setting by exporting `LV` with |
| 789 | another value or setting `core.pager` to `lv +c`. |
| Junio C Hamano | 28d8ede | 2007-07-05 05:51:38 | [diff] [blame] | 790 | |
| Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 791 | core.whitespace:: |
| 792 | A comma separated list of common whitespace problems to |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 793 | notice. 'git diff' will use `color.diff.whitespace` to |
| 794 | highlight them, and 'git apply --whitespace=error' will |
| Junio C Hamano | 3db8b41 | 2008-07-26 06:45:59 | [diff] [blame] | 795 | consider them as errors. You can prefix `-` to disable |
| 796 | any of them (e.g. `-trailing-space`): |
| Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 797 | + |
| Junio C Hamano | b71a22d | 2009-10-17 08:23:47 | [diff] [blame] | 798 | * `blank-at-eol` treats trailing whitespaces at the end of the line |
| Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 799 | as an error (enabled by default). |
| 800 | * `space-before-tab` treats a space character that appears immediately |
| 801 | before a tab character in the initial indent part of the line as an |
| 802 | error (enabled by default). |
| Junio C Hamano | 281fd39 | 2012-09-17 23:57:41 | [diff] [blame] | 803 | * `indent-with-non-tab` treats a line that is indented with space |
| 804 | characters instead of the equivalent tabs as an error (not enabled by |
| 805 | default). |
| Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 806 | * `tab-in-indent` treats a tab character in the initial indent part of |
| 807 | the line as an error (not enabled by default). |
| Junio C Hamano | b71a22d | 2009-10-17 08:23:47 | [diff] [blame] | 808 | * `blank-at-eof` treats blank lines added at the end of file as an error |
| 809 | (enabled by default). |
| 810 | * `trailing-space` is a short-hand to cover both `blank-at-eol` and |
| 811 | `blank-at-eof`. |
| Junio C Hamano | 601f3e5 | 2008-02-25 08:40:42 | [diff] [blame] | 812 | * `cr-at-eol` treats a carriage-return at the end of line as |
| 813 | part of the line terminator, i.e. with it, `trailing-space` |
| 814 | does not trigger if the character before such a carriage-return |
| 815 | is not a whitespace (not enabled by default). |
| Junio C Hamano | eef01fe | 2010-12-13 08:31:58 | [diff] [blame] | 816 | * `tabwidth=<n>` tells how many character positions a tab occupies; this |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 817 | is relevant for `indent-with-non-tab` and when Git fixes `tab-in-indent` |
| Junio C Hamano | eef01fe | 2010-12-13 08:31:58 | [diff] [blame] | 818 | 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] | 819 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 820 | core.fsyncObjectFiles:: |
| Junio C Hamano | 9eb5753 | 2008-06-26 06:33:46 | [diff] [blame] | 821 | This boolean will enable 'fsync()' when writing object files. |
| 822 | + |
| 823 | This is a total waste of time and effort on a filesystem that orders |
| 824 | data writes properly, but can be useful for filesystems that do not use |
| 825 | journalling (traditional UNIX filesystems) or that only journal metadata |
| 826 | and not file contents (OS X's HFS+, or Linux ext3 with "data=writeback"). |
| 827 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 828 | core.preloadIndex:: |
| Junio C Hamano | 610d176 | 2008-11-28 06:27:13 | [diff] [blame] | 829 | Enable parallel index preload for operations like 'git diff' |
| 830 | + |
| 831 | This can speed up operations like 'git diff' and 'git status' especially |
| 832 | on filesystems like NFS that have weak caching semantics and thus |
| Junio C Hamano | c8c398a | 2014-06-16 21:14:05 | [diff] [blame] | 833 | relatively high IO latencies. When enabled, Git will do the |
| Junio C Hamano | 610d176 | 2008-11-28 06:27:13 | [diff] [blame] | 834 | index comparison to the filesystem data in parallel, allowing |
| Junio C Hamano | c8c398a | 2014-06-16 21:14:05 | [diff] [blame] | 835 | overlapping IO's. Defaults to true. |
| Junio C Hamano | 610d176 | 2008-11-28 06:27:13 | [diff] [blame] | 836 | |
| Junio C Hamano | a9499de | 2009-04-30 03:38:48 | [diff] [blame] | 837 | core.createObject:: |
| 838 | You can set this to 'link', in which case a hardlink followed by |
| 839 | a delete of the source are used to make sure that object creation |
| 840 | will not overwrite existing objects. |
| 841 | + |
| 842 | On some file system/operating system combinations, this is unreliable. |
| 843 | Set this config setting to 'rename' there; However, This will remove the |
| 844 | check that makes sure that existing object files will not get overwritten. |
| Junio C Hamano | e91ea77 | 2009-04-26 01:41:41 | [diff] [blame] | 845 | |
| Junio C Hamano | 3b70d3c | 2009-11-21 17:37:37 | [diff] [blame] | 846 | core.notesRef:: |
| 847 | When showing commit messages, also show notes which are stored in |
| Junio C Hamano | a574a09 | 2010-06-13 19:57:10 | [diff] [blame] | 848 | the given ref. The ref must be fully qualified. If the given |
| 849 | ref does not exist, it is not an error but means that no |
| 850 | notes should be printed. |
| Junio C Hamano | 3b70d3c | 2009-11-21 17:37:37 | [diff] [blame] | 851 | + |
| Junio C Hamano | a574a09 | 2010-06-13 19:57:10 | [diff] [blame] | 852 | This setting defaults to "refs/notes/commits", and it can be overridden by |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 853 | the `GIT_NOTES_REF` environment variable. See linkgit:git-notes[1]. |
| Junio C Hamano | 3b70d3c | 2009-11-21 17:37:37 | [diff] [blame] | 854 | |
| Junio C Hamano | 3c8d670 | 2010-01-13 23:09:03 | [diff] [blame] | 855 | core.sparseCheckout:: |
| 856 | Enable "sparse checkout" feature. See section "Sparse checkout" in |
| 857 | linkgit:git-read-tree[1] for more information. |
| 858 | |
| Junio C Hamano | 6371b0e | 2011-03-23 23:36:21 | [diff] [blame] | 859 | core.abbrev:: |
| Junio C Hamano | 56ace3d | 2017-01-10 23:43:41 | [diff] [blame] | 860 | Set the length object names are abbreviated to. If |
| 861 | unspecified or set to "auto", an appropriate value is |
| 862 | computed based on the approximate number of packed objects |
| 863 | in your repository, which hopefully is enough for |
| 864 | abbreviated object names to stay unique for some time. |
| Junio C Hamano | 6371b0e | 2011-03-23 23:36:21 | [diff] [blame] | 865 | |
| Junio C Hamano | 6018664 | 2010-12-02 14:18:26 | [diff] [blame] | 866 | add.ignoreErrors:: |
| Junio C Hamano | be08798 | 2015-02-22 21:29:39 | [diff] [blame] | 867 | add.ignore-errors (deprecated):: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 868 | Tells 'git add' to continue adding files when some files cannot be |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 869 | added due to indexing errors. Equivalent to the `--ignore-errors` |
| Junio C Hamano | be08798 | 2015-02-22 21:29:39 | [diff] [blame] | 870 | option of linkgit:git-add[1]. `add.ignore-errors` is deprecated, |
| 871 | as it does not follow the usual naming convention for configuration |
| 872 | variables. |
| Junio C Hamano | 3d14151 | 2009-06-01 01:22:40 | [diff] [blame] | 873 | |
| Junio C Hamano | 33db437 | 2006-06-07 19:51:45 | [diff] [blame] | 874 | alias.*:: |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 875 | Command aliases for the linkgit:git[1] command wrapper - e.g. |
| Junio C Hamano | 33db437 | 2006-06-07 19:51:45 | [diff] [blame] | 876 | after defining "alias.last = cat-file commit HEAD", the invocation |
| 877 | "git last" is equivalent to "git cat-file commit HEAD". To avoid |
| Junio C Hamano | f1d1480 | 2006-06-08 00:48:17 | [diff] [blame] | 878 | confusion and troubles with script usage, aliases that |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 879 | hide existing Git commands are ignored. Arguments are split by |
| Junio C Hamano | f1d1480 | 2006-06-08 00:48:17 | [diff] [blame] | 880 | spaces, the usual shell quoting and escaping is supported. |
| Junio C Hamano | 2efd5e4 | 2014-11-10 22:38:52 | [diff] [blame] | 881 | A quote pair or a backslash can be used to quote them. |
| Junio C Hamano | dbb6459 | 2007-09-01 11:17:39 | [diff] [blame] | 882 | + |
| 883 | If the alias expansion is prefixed with an exclamation point, |
| 884 | it will be treated as a shell command. For example, defining |
| 885 | "alias.new = !gitk --all --not ORIG_HEAD", the invocation |
| 886 | "git new" is equivalent to running the shell command |
| Junio C Hamano | 48bc1ce | 2009-07-09 16:49:19 | [diff] [blame] | 887 | "gitk --all --not ORIG_HEAD". Note that shell commands will be |
| 888 | executed from the top-level directory of a repository, which may |
| 889 | not necessarily be the current directory. |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 890 | `GIT_PREFIX` is set as returned by running 'git rev-parse --show-prefix' |
| Junio C Hamano | 5f2627d | 2011-05-06 20:23:48 | [diff] [blame] | 891 | from the original current directory. See linkgit:git-rev-parse[1]. |
| Junio C Hamano | 9cb74f2 | 2007-02-12 04:15:05 | [diff] [blame] | 892 | |
| Junio C Hamano | caa712a | 2010-03-11 01:17:35 | [diff] [blame] | 893 | am.keepcr:: |
| 894 | If true, git-am will call git-mailsplit for patches in mbox format |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 895 | with parameter `--keep-cr`. In this case git-mailsplit will |
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 896 | not remove `\r` from lines ending with `\r\n`. Can be overridden |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 897 | by giving `--no-keep-cr` from the command line. |
| Junio C Hamano | caa712a | 2010-03-11 01:17:35 | [diff] [blame] | 898 | See linkgit:git-am[1], linkgit:git-mailsplit[1]. |
| 899 | |
| Junio C Hamano | 9c51287 | 2015-08-12 21:59:25 | [diff] [blame] | 900 | am.threeWay:: |
| 901 | By default, `git am` will fail if the patch does not apply cleanly. When |
| 902 | set to true, this setting tells `git am` to fall back on 3-way merge if |
| 903 | the patch records the identity of blobs it is supposed to apply to and |
| 904 | we have those blobs available locally (equivalent to giving the `--3way` |
| 905 | option from the command line). Defaults to `false`. |
| 906 | See linkgit:git-am[1]. |
| 907 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 908 | apply.ignoreWhitespace:: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 909 | When set to 'change', tells 'git apply' to ignore changes in |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 910 | whitespace, in the same way as the `--ignore-space-change` |
| Junio C Hamano | fe24db0 | 2009-08-22 05:10:47 | [diff] [blame] | 911 | option. |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 912 | 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] | 913 | respect all whitespace differences. |
| 914 | See linkgit:git-apply[1]. |
| 915 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 916 | apply.whitespace:: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 917 | Tells 'git apply' how to handle whitespaces, in the same way |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 918 | as the `--whitespace` option. See linkgit:git-apply[1]. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 919 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 920 | branch.autoSetupMerge:: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 921 | Tells 'git branch' and 'git checkout' to set up new branches |
| Junio C Hamano | 24bc09a | 2008-02-28 00:27:44 | [diff] [blame] | 922 | so that linkgit:git-pull[1] will appropriately merge from the |
| 923 | starting point branch. Note that even if this option is not set, |
| Junio C Hamano | 7fd8417 | 2007-05-24 07:00:32 | [diff] [blame] | 924 | this behavior can be chosen per-branch using the `--track` |
| Junio C Hamano | 24bc09a | 2008-02-28 00:27:44 | [diff] [blame] | 925 | and `--no-track` options. The valid settings are: `false` -- no |
| 926 | automatic setup is done; `true` -- automatic setup is done when the |
| Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 927 | starting point is a remote-tracking branch; `always` -- |
| 928 | automatic setup is done when the starting point is either a |
| 929 | local branch or remote-tracking |
| Junio C Hamano | 24bc09a | 2008-02-28 00:27:44 | [diff] [blame] | 930 | branch. This option defaults to true. |
| Junio C Hamano | 7fd8417 | 2007-05-24 07:00:32 | [diff] [blame] | 931 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 932 | branch.autoSetupRebase:: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 933 | When a new branch is created with 'git branch' or 'git checkout' |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 934 | that tracks another branch, this variable tells Git to set |
| Junio C Hamano | 869bb80 | 2008-05-12 00:29:47 | [diff] [blame] | 935 | up pull to rebase instead of merge (see "branch.<name>.rebase"). |
| 936 | When `never`, rebase is never automatically set to true. |
| 937 | When `local`, rebase is set to true for tracked branches of |
| 938 | other local branches. |
| 939 | When `remote`, rebase is set to true for tracked branches of |
| Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 940 | remote-tracking branches. |
| Junio C Hamano | 869bb80 | 2008-05-12 00:29:47 | [diff] [blame] | 941 | When `always`, rebase will be set to true for all tracking |
| 942 | branches. |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 943 | See "branch.autoSetupMerge" for details on how to set up a |
| Junio C Hamano | 869bb80 | 2008-05-12 00:29:47 | [diff] [blame] | 944 | branch to track another branch. |
| 945 | This option defaults to never. |
| 946 | |
| Junio C Hamano | 47c1e3c | 2006-09-25 04:45:55 | [diff] [blame] | 947 | branch.<name>.remote:: |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 948 | When on branch <name>, it tells 'git fetch' and 'git push' |
| 949 | which remote to fetch from/push to. The remote to push to |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 950 | may be overridden with `remote.pushDefault` (for all branches). |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 951 | The remote to push to, for the current branch, may be further |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 952 | overridden by `branch.<name>.pushRemote`. If no remote is |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 953 | configured, or if you are not on any branch, it defaults to |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 954 | `origin` for fetching and `remote.pushDefault` for pushing. |
| Junio C Hamano | 238ce9c | 2013-10-23 21:56:38 | [diff] [blame] | 955 | Additionally, `.` (a period) is the current local repository |
| 956 | (a dot-repository), see `branch.<name>.merge`'s final note below. |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 957 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 958 | branch.<name>.pushRemote:: |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 959 | When on branch <name>, it overrides `branch.<name>.remote` for |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 960 | pushing. It also overrides `remote.pushDefault` for pushing |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 961 | from branch <name>. When you pull from one place (e.g. your |
| 962 | upstream) and push to another place (e.g. your own publishing |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 963 | repository), you would want to set `remote.pushDefault` to |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 964 | specify the remote to push to for all branches, and use this |
| 965 | option to override it for a specific branch. |
| Junio C Hamano | 47c1e3c | 2006-09-25 04:45:55 | [diff] [blame] | 966 | |
| 967 | branch.<name>.merge:: |
| Junio C Hamano | 0706c80 | 2009-03-30 22:34:19 | [diff] [blame] | 968 | Defines, together with branch.<name>.remote, the upstream branch |
| Junio C Hamano | b02377c | 2011-04-28 22:26:02 | [diff] [blame] | 969 | 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] | 970 | branch to merge and can also affect 'git push' (see push.default). |
| 971 | When in branch <name>, it tells 'git fetch' the default |
| Junio C Hamano | c2b4709 | 2007-10-25 06:50:31 | [diff] [blame] | 972 | refspec to be marked for merging in FETCH_HEAD. The value is |
| 973 | handled like the remote part of a refspec, and must match a |
| 974 | ref which is fetched from the remote given by |
| 975 | "branch.<name>.remote". |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 976 | The merge information is used by 'git pull' (which at first calls |
| 977 | 'git fetch') to lookup the default branch for merging. Without |
| 978 | this option, 'git pull' defaults to merge the first refspec fetched. |
| Junio C Hamano | 96010b2 | 2006-12-09 21:15:46 | [diff] [blame] | 979 | Specify multiple values to get an octopus merge. |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 980 | 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] | 981 | another branch in the local repository, you can point |
| Junio C Hamano | 238ce9c | 2013-10-23 21:56:38 | [diff] [blame] | 982 | branch.<name>.merge to the desired branch, and use the relative path |
| 983 | setting `.` (a period) for branch.<name>.remote. |
| Junio C Hamano | 47c1e3c | 2006-09-25 04:45:55 | [diff] [blame] | 984 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 985 | branch.<name>.mergeOptions:: |
| Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 986 | Sets default options for merging into branch <name>. The syntax and |
| Junio C Hamano | c0e55e7 | 2009-10-10 00:56:29 | [diff] [blame] | 987 | 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] | 988 | option values containing whitespace characters are currently not |
| 989 | supported. |
| 990 | |
| Junio C Hamano | 0c99970 | 2007-12-03 09:57:55 | [diff] [blame] | 991 | branch.<name>.rebase:: |
| 992 | When true, rebase the branch <name> on top of the fetched branch, |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 993 | instead of merging the default branch from the default remote when |
| Junio C Hamano | 515ab1d | 2011-12-09 23:41:20 | [diff] [blame] | 994 | "git pull" is run. See "pull.rebase" for doing this in a non |
| 995 | branch-specific manner. |
| 996 | + |
| Junio C Hamano | 7db630e | 2015-09-17 20:26:22 | [diff] [blame] | 997 | When preserve, also pass `--preserve-merges` along to 'git rebase' |
| 998 | so that locally committed merge commits will not be flattened |
| 999 | by running 'git pull'. |
| Junio C Hamano | cf4a174 | 2013-09-11 22:57:50 | [diff] [blame] | 1000 | + |
| Junio C Hamano | 289d7e8 | 2016-01-27 00:20:38 | [diff] [blame] | 1001 | When the value is `interactive`, the rebase is run in interactive mode. |
| 1002 | + |
| Junio C Hamano | 515ab1d | 2011-12-09 23:41:20 | [diff] [blame] | 1003 | *NOTE*: this is a possibly dangerous operation; do *not* use |
| 1004 | it unless you understand the implications (see linkgit:git-rebase[1] |
| 1005 | for details). |
| Junio C Hamano | 0c99970 | 2007-12-03 09:57:55 | [diff] [blame] | 1006 | |
| Junio C Hamano | 4624718 | 2013-01-09 20:50:28 | [diff] [blame] | 1007 | branch.<name>.description:: |
| 1008 | Branch description, can be edited with |
| 1009 | `git branch --edit-description`. Branch description is |
| 1010 | automatically added in the format-patch cover letter or |
| 1011 | request-pull summary. |
| 1012 | |
| Junio C Hamano | 8760ea6 | 2008-03-14 08:58:45 | [diff] [blame] | 1013 | browser.<tool>.cmd:: |
| 1014 | Specify the command to invoke the specified browser. The |
| 1015 | specified command is evaluated in shell with the URLs passed |
| Junio C Hamano | 360e3a1 | 2011-07-13 23:51:56 | [diff] [blame] | 1016 | as arguments. (See linkgit:git-web{litdd}browse[1].) |
| Junio C Hamano | 8760ea6 | 2008-03-14 08:58:45 | [diff] [blame] | 1017 | |
| Junio C Hamano | e35a6fc | 2008-01-29 09:46:27 | [diff] [blame] | 1018 | browser.<tool>.path:: |
| 1019 | Override the path for the given tool that may be used to |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 1020 | browse HTML help (see `-w` option in linkgit:git-help[1]) or a |
| Junio C Hamano | e35a6fc | 2008-01-29 09:46:27 | [diff] [blame] | 1021 | working repository in gitweb (see linkgit:git-instaweb[1]). |
| 1022 | |
| Junio C Hamano | 47b9acd | 2007-04-24 07:34:34 | [diff] [blame] | 1023 | clean.requireForce:: |
| Junio C Hamano | e6f28d0 | 2013-09-17 21:34:00 | [diff] [blame] | 1024 | A boolean to make git-clean do nothing unless given -f, |
| 1025 | -i or -n. Defaults to true. |
| Junio C Hamano | 47b9acd | 2007-04-24 07:34:34 | [diff] [blame] | 1026 | |
| Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 1027 | color.branch:: |
| 1028 | A boolean to enable/disable color in the output of |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1029 | linkgit:git-branch[1]. May be set to `always`, |
| Junio C Hamano | 0fc8cd9 | 2007-12-06 03:26:21 | [diff] [blame] | 1030 | `false` (or `never`) or `auto` (or `true`), in which case colors are used |
| Junio C Hamano | ad70bf0 | 2016-09-26 23:44:27 | [diff] [blame] | 1031 | only when the output is to a terminal. If unset, then the |
| 1032 | value of `color.ui` is used (`auto` by default). |
| Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 1033 | |
| 1034 | color.branch.<slot>:: |
| 1035 | Use customized color for branch coloration. `<slot>` is one of |
| 1036 | `current` (the current branch), `local` (a local branch), |
| Junio C Hamano | 7692782 | 2013-04-19 21:26:57 | [diff] [blame] | 1037 | `remote` (a remote-tracking branch in refs/remotes/), |
| 1038 | `upstream` (upstream tracking branch), `plain` (other |
| Junio C Hamano | 5a70233 | 2007-01-28 20:55:22 | [diff] [blame] | 1039 | refs). |
| Junio C Hamano | eb69295 | 2007-01-03 22:02:12 | [diff] [blame] | 1040 | |
| Junio C Hamano | 3f403b0 | 2006-12-13 10:14:13 | [diff] [blame] | 1041 | color.diff:: |
| Junio C Hamano | 5f2627d | 2011-05-06 20:23:48 | [diff] [blame] | 1042 | Whether to use ANSI escape sequences to add color to patches. |
| 1043 | If this is set to `always`, linkgit:git-diff[1], |
| 1044 | linkgit:git-log[1], and linkgit:git-show[1] will use color |
| 1045 | for all patches. If it is set to `true` or `auto`, those |
| 1046 | commands will only use color when output is to the terminal. |
| Junio C Hamano | ad70bf0 | 2016-09-26 23:44:27 | [diff] [blame] | 1047 | If unset, then the value of `color.ui` is used (`auto` by |
| 1048 | default). |
| Junio C Hamano | 5f2627d | 2011-05-06 20:23:48 | [diff] [blame] | 1049 | + |
| Junio C Hamano | d75148a | 2014-04-08 19:48:38 | [diff] [blame] | 1050 | This does not affect linkgit:git-format-patch[1] or the |
| Junio C Hamano | 5f2627d | 2011-05-06 20:23:48 | [diff] [blame] | 1051 | 'git-diff-{asterisk}' plumbing commands. Can be overridden on the |
| 1052 | command line with the `--color[=<when>]` option. |
| Junio C Hamano | 9ae1a06 | 2006-07-10 08:12:34 | [diff] [blame] | 1053 | |
| Junio C Hamano | 3f403b0 | 2006-12-13 10:14:13 | [diff] [blame] | 1054 | color.diff.<slot>:: |
| Junio C Hamano | 5a70233 | 2007-01-28 20:55:22 | [diff] [blame] | 1055 | Use customized color for diff colorization. `<slot>` specifies |
| 1056 | which part of the patch to use the specified color, and is one |
| Junio C Hamano | 8c5d594 | 2015-06-11 19:37:48 | [diff] [blame] | 1057 | of `context` (context text - `plain` is a historical synonym), |
| 1058 | `meta` (metainformation), `frag` |
| Junio C Hamano | 2bd8a74 | 2009-12-01 21:16:59 | [diff] [blame] | 1059 | (hunk header), 'func' (function in hunk header), `old` (removed lines), |
| 1060 | `new` (added lines), `commit` (commit headers), or `whitespace` |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 1061 | (highlighting whitespace errors). |
| Junio C Hamano | 9ae1a06 | 2006-07-10 08:12:34 | [diff] [blame] | 1062 | |
| Junio C Hamano | 7d44952 | 2010-07-01 00:08:51 | [diff] [blame] | 1063 | color.decorate.<slot>:: |
| 1064 | Use customized color for 'git log --decorate' output. `<slot>` is one |
| 1065 | of `branch`, `remoteBranch`, `tag`, `stash` or `HEAD` for local |
| Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1066 | branches, remote-tracking branches, tags, stash and HEAD, respectively. |
| Junio C Hamano | 7d44952 | 2010-07-01 00:08:51 | [diff] [blame] | 1067 | |
| Junio C Hamano | d257cff | 2009-03-18 05:27:16 | [diff] [blame] | 1068 | color.grep:: |
| 1069 | When set to `always`, always highlight matches. When `false` (or |
| 1070 | `never`), never. When set to `true` or `auto`, use color only |
| Junio C Hamano | ad70bf0 | 2016-09-26 23:44:27 | [diff] [blame] | 1071 | when the output is written to the terminal. If unset, then the |
| 1072 | value of `color.ui` is used (`auto` by default). |
| Junio C Hamano | d257cff | 2009-03-18 05:27:16 | [diff] [blame] | 1073 | |
| Junio C Hamano | 0299d92 | 2010-03-20 20:59:31 | [diff] [blame] | 1074 | color.grep.<slot>:: |
| 1075 | Use customized color for grep colorization. `<slot>` specifies which |
| 1076 | part of the line to use the specified color, and is one of |
| 1077 | + |
| 1078 | -- |
| 1079 | `context`;; |
| 1080 | non-matching text in context lines (when using `-A`, `-B`, or `-C`) |
| 1081 | `filename`;; |
| 1082 | filename prefix (when not using `-h`) |
| 1083 | `function`;; |
| 1084 | function name lines (when using `-p`) |
| 1085 | `linenumber`;; |
| 1086 | line number prefix (when using `-n`) |
| 1087 | `match`;; |
| Junio C Hamano | c14e6ad | 2014-10-31 20:25:53 | [diff] [blame] | 1088 | matching text (same as setting `matchContext` and `matchSelected`) |
| 1089 | `matchContext`;; |
| 1090 | matching text in context lines |
| 1091 | `matchSelected`;; |
| 1092 | matching text in selected lines |
| Junio C Hamano | 0299d92 | 2010-03-20 20:59:31 | [diff] [blame] | 1093 | `selected`;; |
| 1094 | non-matching text in selected lines |
| 1095 | `separator`;; |
| 1096 | separators between fields on a line (`:`, `-`, and `=`) |
| 1097 | and between hunks (`--`) |
| 1098 | -- |
| Junio C Hamano | d257cff | 2009-03-18 05:27:16 | [diff] [blame] | 1099 | |
| Junio C Hamano | 00b8b63 | 2007-12-07 09:50:49 | [diff] [blame] | 1100 | color.interactive:: |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1101 | When set to `always`, always use colors for interactive prompts |
| Junio C Hamano | 58f587a | 2013-07-22 19:20:59 | [diff] [blame] | 1102 | and displays (such as those used by "git-add --interactive" and |
| 1103 | "git-clean --interactive"). When false (or `never`), never. |
| 1104 | When set to `true` or `auto`, use colors only when the output is |
| Junio C Hamano | ad70bf0 | 2016-09-26 23:44:27 | [diff] [blame] | 1105 | to the terminal. If unset, then the value of `color.ui` is |
| 1106 | used (`auto` by default). |
| Junio C Hamano | 00b8b63 | 2007-12-07 09:50:49 | [diff] [blame] | 1107 | |
| 1108 | color.interactive.<slot>:: |
| Junio C Hamano | 58f587a | 2013-07-22 19:20:59 | [diff] [blame] | 1109 | Use customized color for 'git add --interactive' and 'git clean |
| 1110 | --interactive' output. `<slot>` may be `prompt`, `header`, `help` |
| 1111 | or `error`, for four distinct types of normal output from |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 1112 | interactive commands. |
| Junio C Hamano | 00b8b63 | 2007-12-07 09:50:49 | [diff] [blame] | 1113 | |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1114 | color.pager:: |
| 1115 | A boolean to enable/disable colored output when the pager is in |
| 1116 | use (default is true). |
| 1117 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1118 | color.showBranch:: |
| Junio C Hamano | 52ba295 | 2009-05-18 17:43:02 | [diff] [blame] | 1119 | A boolean to enable/disable color in the output of |
| 1120 | linkgit:git-show-branch[1]. May be set to `always`, |
| 1121 | `false` (or `never`) or `auto` (or `true`), in which case colors are used |
| Junio C Hamano | ad70bf0 | 2016-09-26 23:44:27 | [diff] [blame] | 1122 | only when the output is to a terminal. If unset, then the |
| 1123 | value of `color.ui` is used (`auto` by default). |
| Junio C Hamano | 52ba295 | 2009-05-18 17:43:02 | [diff] [blame] | 1124 | |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1125 | color.status:: |
| 1126 | A boolean to enable/disable color in the output of |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1127 | linkgit:git-status[1]. May be set to `always`, |
| Junio C Hamano | 0fc8cd9 | 2007-12-06 03:26:21 | [diff] [blame] | 1128 | `false` (or `never`) or `auto` (or `true`), in which case colors are used |
| Junio C Hamano | ad70bf0 | 2016-09-26 23:44:27 | [diff] [blame] | 1129 | only when the output is to a terminal. If unset, then the |
| 1130 | value of `color.ui` is used (`auto` by default). |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1131 | |
| 1132 | color.status.<slot>:: |
| 1133 | Use customized color for status colorization. `<slot>` is |
| 1134 | one of `header` (the header text of the status message), |
| Junio C Hamano | 7d23f5e | 2006-12-16 07:44:04 | [diff] [blame] | 1135 | `added` or `updated` (files which are added but not committed), |
| 1136 | `changed` (files which are changed but not added in the index), |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1137 | `untracked` (files which are not tracked by Git), |
| Junio C Hamano | 5992a25 | 2015-03-17 23:39:30 | [diff] [blame] | 1138 | `branch` (the current branch), |
| Junio C Hamano | b713ff1 | 2008-05-24 01:12:30 | [diff] [blame] | 1139 | `nobranch` (the color the 'no branch' warning is shown in, defaulting |
| Junio C Hamano | d517690 | 2017-05-16 04:30:56 | [diff] [blame] | 1140 | to red), |
| 1141 | `localBranch` or `remoteBranch` (the local and remote branch names, |
| 1142 | respectively, when branch and tracking information is displayed in the |
| 1143 | status short-format), or |
| Junio C Hamano | 5992a25 | 2015-03-17 23:39:30 | [diff] [blame] | 1144 | `unmerged` (files which have unmerged changes). |
| Junio C Hamano | e7935c4 | 2006-12-13 21:32:17 | [diff] [blame] | 1145 | |
| Junio C Hamano | 83d46a2 | 2008-02-21 02:29:42 | [diff] [blame] | 1146 | color.ui:: |
| Junio C Hamano | 5f2627d | 2011-05-06 20:23:48 | [diff] [blame] | 1147 | This variable determines the default value for variables such |
| 1148 | as `color.diff` and `color.grep` that control the use of color |
| 1149 | per command family. Its scope will expand as more commands learn |
| 1150 | configuration to set a default for the `--color` option. Set it |
| Junio C Hamano | fa1d349 | 2013-06-20 23:39:43 | [diff] [blame] | 1151 | to `false` or `never` if you prefer Git commands not to use |
| 1152 | color unless enabled explicitly with some other configuration |
| 1153 | or the `--color` option. Set it to `always` if you want all |
| 1154 | output not intended for machine consumption to use color, to |
| 1155 | `true` or `auto` (this is the default since Git 1.8.4) if you |
| 1156 | want such output to use color when written to the terminal. |
| Junio C Hamano | 83d46a2 | 2008-02-21 02:29:42 | [diff] [blame] | 1157 | |
| Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 1158 | column.ui:: |
| 1159 | Specify whether supported commands should output in columns. |
| 1160 | This variable consists of a list of tokens separated by spaces |
| 1161 | or commas: |
| 1162 | + |
| Junio C Hamano | a195230 | 2013-07-01 21:31:18 | [diff] [blame] | 1163 | These options control when the feature should be enabled |
| 1164 | (defaults to 'never'): |
| 1165 | + |
| Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 1166 | -- |
| 1167 | `always`;; |
| 1168 | always show in columns |
| 1169 | `never`;; |
| 1170 | never show in columns |
| 1171 | `auto`;; |
| 1172 | show in columns if the output is to the terminal |
| Junio C Hamano | a195230 | 2013-07-01 21:31:18 | [diff] [blame] | 1173 | -- |
| 1174 | + |
| 1175 | These options control layout (defaults to 'column'). Setting any |
| 1176 | of these implies 'always' if none of 'always', 'never', or 'auto' are |
| 1177 | specified. |
| 1178 | + |
| 1179 | -- |
| Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 1180 | `column`;; |
| Junio C Hamano | a195230 | 2013-07-01 21:31:18 | [diff] [blame] | 1181 | fill columns before rows |
| Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 1182 | `row`;; |
| 1183 | fill rows before columns |
| 1184 | `plain`;; |
| 1185 | show in one column |
| Junio C Hamano | a195230 | 2013-07-01 21:31:18 | [diff] [blame] | 1186 | -- |
| 1187 | + |
| 1188 | Finally, these options can be combined with a layout option (defaults |
| 1189 | to 'nodense'): |
| 1190 | + |
| 1191 | -- |
| Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 1192 | `dense`;; |
| 1193 | make unequal size columns to utilize more space |
| 1194 | `nodense`;; |
| 1195 | make equal size columns |
| 1196 | -- |
| Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 1197 | |
| 1198 | column.branch:: |
| 1199 | Specify whether to output branch listing in `git branch` in columns. |
| 1200 | See `column.ui` for details. |
| 1201 | |
| Junio C Hamano | 58f587a | 2013-07-22 19:20:59 | [diff] [blame] | 1202 | column.clean:: |
| 1203 | Specify the layout when list items in `git clean -i`, which always |
| 1204 | shows files and directories in columns. See `column.ui` for details. |
| 1205 | |
| Junio C Hamano | 22700fb | 2012-05-03 23:07:25 | [diff] [blame] | 1206 | column.status:: |
| 1207 | Specify whether to output untracked files in `git status` in columns. |
| 1208 | See `column.ui` for details. |
| 1209 | |
| 1210 | column.tag:: |
| 1211 | Specify whether to output tag listing in `git tag` in columns. |
| 1212 | See `column.ui` for details. |
| 1213 | |
| Junio C Hamano | ce836cc | 2013-01-21 02:01:53 | [diff] [blame] | 1214 | commit.cleanup:: |
| 1215 | This setting overrides the default of the `--cleanup` option in |
| 1216 | `git commit`. See linkgit:git-commit[1] for details. Changing the |
| 1217 | default can be useful when you always want to keep lines that begin |
| 1218 | with comment character `#` in your log message, in which case you |
| 1219 | would do `git config commit.cleanup whitespace` (note that you will |
| 1220 | have to remove the help lines that begin with `#` in the commit log |
| 1221 | template yourself, if you do this). |
| 1222 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1223 | commit.gpgSign:: |
| Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 1224 | |
| 1225 | A boolean to specify whether all commits should be GPG signed. |
| 1226 | Use of this option when doing operations such as rebase can |
| 1227 | result in a large number of commits being signed. It may be |
| 1228 | convenient to use an agent to avoid typing your GPG passphrase |
| 1229 | several times. |
| 1230 | |
| Junio C Hamano | d0d892c | 2010-01-24 20:06:29 | [diff] [blame] | 1231 | commit.status:: |
| Junio C Hamano | 6ce6b6c | 2010-01-18 01:25:50 | [diff] [blame] | 1232 | A boolean to enable/disable inclusion of status information in the |
| 1233 | commit message template when using an editor to prepare the commit |
| 1234 | message. Defaults to true. |
| 1235 | |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 1236 | commit.template:: |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 1237 | Specify the pathname of a file to use as the template for |
| 1238 | new commit messages. |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 1239 | |
| Junio C Hamano | f2a3a75 | 2016-05-23 22:54:39 | [diff] [blame] | 1240 | commit.verbose:: |
| 1241 | A boolean or int to specify the level of verbose with `git commit`. |
| 1242 | See linkgit:git-commit[1]. |
| 1243 | |
| Junio C Hamano | 0df9271 | 2011-12-21 22:30:44 | [diff] [blame] | 1244 | credential.helper:: |
| 1245 | Specify an external helper to be called when a username or |
| 1246 | password credential is needed; the helper may consult external |
| Junio C Hamano | 4ba4a78 | 2016-04-03 19:11:32 | [diff] [blame] | 1247 | storage to avoid prompting the user for the credentials. Note |
| 1248 | that multiple helpers may be defined. See linkgit:gitcredentials[7] |
| 1249 | for details. |
| Junio C Hamano | 0df9271 | 2011-12-21 22:30:44 | [diff] [blame] | 1250 | |
| 1251 | credential.useHttpPath:: |
| 1252 | When acquiring credentials, consider the "path" component of an http |
| 1253 | or https URL to be important. Defaults to false. See |
| 1254 | linkgit:gitcredentials[7] for more information. |
| 1255 | |
| 1256 | credential.username:: |
| 1257 | If no username is set for a network authentication, use this username |
| 1258 | by default. See credential.<context>.* below, and |
| 1259 | linkgit:gitcredentials[7]. |
| 1260 | |
| 1261 | credential.<url>.*:: |
| 1262 | Any of the credential.* options above can be applied selectively to |
| 1263 | some credentials. For example "credential.https://example.com.username" |
| 1264 | would set the default username only for https connections to |
| 1265 | example.com. See linkgit:gitcredentials[7] for details on how URLs are |
| 1266 | matched. |
| 1267 | |
| Junio C Hamano | abb8a05 | 2015-12-04 22:43:11 | [diff] [blame] | 1268 | credentialCache.ignoreSIGHUP:: |
| 1269 | Tell git-credential-cache--daemon to ignore SIGHUP, instead of quitting. |
| 1270 | |
| Junio C Hamano | 209ebe8 | 2011-04-27 21:09:59 | [diff] [blame] | 1271 | include::diff-config.txt[] |
| Junio C Hamano | 3bd66e9 | 2009-04-18 06:17:56 | [diff] [blame] | 1272 | |
| 1273 | difftool.<tool>.path:: |
| 1274 | Override the path for the given tool. This is useful in case |
| 1275 | your tool is not in the PATH. |
| 1276 | |
| 1277 | difftool.<tool>.cmd:: |
| 1278 | Specify the command to invoke the specified diff tool. |
| 1279 | The specified command is evaluated in shell with the following |
| 1280 | variables available: 'LOCAL' is set to the name of the temporary |
| 1281 | file containing the contents of the diff pre-image and 'REMOTE' |
| 1282 | is set to the name of the temporary file containing the contents |
| 1283 | of the diff post-image. |
| 1284 | |
| 1285 | difftool.prompt:: |
| 1286 | Prompt before each invocation of the diff tool. |
| 1287 | |
| Junio C Hamano | fedb1b4 | 2016-06-20 21:23:40 | [diff] [blame] | 1288 | fastimport.unpackLimit:: |
| 1289 | If the number of objects imported by linkgit:git-fast-import[1] |
| 1290 | is below this limit, then the objects will be unpacked into |
| 1291 | loose object files. However if the number of imported objects |
| 1292 | equals or exceeds this limit then the pack will be stored as a |
| 1293 | pack. Storing the pack from a fast-import can make the import |
| 1294 | operation complete faster, especially on slow filesystems. If |
| 1295 | not set, the value of `transfer.unpackLimit` is used instead. |
| 1296 | |
| Junio C Hamano | 0d75e87 | 2010-12-17 06:57:26 | [diff] [blame] | 1297 | fetch.recurseSubmodules:: |
| Junio C Hamano | 5cd1518 | 2011-04-05 00:21:10 | [diff] [blame] | 1298 | This option can be either set to a boolean value or to 'on-demand'. |
| 1299 | Setting it to a boolean changes the behavior of fetch and pull to |
| 1300 | unconditionally recurse into submodules when set to true or to not |
| 1301 | recurse at all when set to false. When set to 'on-demand' (the default |
| 1302 | value), fetch and pull will only recurse into a populated submodule |
| 1303 | when its superproject retrieves a commit that updates the submodule's |
| 1304 | reference. |
| Junio C Hamano | 0d75e87 | 2010-12-17 06:57:26 | [diff] [blame] | 1305 | |
| Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 1306 | fetch.fsckObjects:: |
| 1307 | If it is set to true, git-fetch-pack will check all fetched |
| 1308 | objects. It will abort in the case of a malformed object or a |
| 1309 | broken link. The result of an abort are only dangling objects. |
| 1310 | Defaults to false. If not set, the value of `transfer.fsckObjects` |
| 1311 | is used instead. |
| 1312 | |
| Junio C Hamano | 54ea8d3 | 2007-01-25 07:59:48 | [diff] [blame] | 1313 | fetch.unpackLimit:: |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1314 | If the number of objects fetched over the Git native |
| Junio C Hamano | 54ea8d3 | 2007-01-25 07:59:48 | [diff] [blame] | 1315 | transfer is below this |
| 1316 | limit, then the objects will be unpacked into loose object |
| 1317 | files. However if the number of received objects equals or |
| 1318 | exceeds this limit then the received pack will be stored as |
| 1319 | a pack, after adding any missing delta bases. Storing the |
| 1320 | pack from a push can make the push operation complete faster, |
| Junio C Hamano | e77b015 | 2008-01-12 06:44:17 | [diff] [blame] | 1321 | especially on slow filesystems. If not set, the value of |
| 1322 | `transfer.unpackLimit` is used instead. |
| Junio C Hamano | 54ea8d3 | 2007-01-25 07:59:48 | [diff] [blame] | 1323 | |
| Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 1324 | fetch.prune:: |
| 1325 | If true, fetch will automatically behave as if the `--prune` |
| 1326 | option was given on the command line. See also `remote.<name>.prune`. |
| 1327 | |
| Junio C Hamano | 1a1b847 | 2016-07-19 21:37:13 | [diff] [blame] | 1328 | fetch.output:: |
| 1329 | Control how ref update status is printed. Valid values are |
| 1330 | `full` and `compact`. Default value is `full`. See section |
| 1331 | OUTPUT in linkgit:git-fetch[1] for detail. |
| 1332 | |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 1333 | format.attach:: |
| 1334 | Enable multipart/mixed attachments as the default for |
| 1335 | 'format-patch'. The value can also be a double quoted string |
| 1336 | which will enable attachments as the default and set the |
| 1337 | value as the boundary. See the --attach option in |
| 1338 | linkgit:git-format-patch[1]. |
| 1339 | |
| Junio C Hamano | af18294 | 2016-08-10 20:46:26 | [diff] [blame] | 1340 | format.from:: |
| 1341 | Provides the default value for the `--from` option to format-patch. |
| 1342 | Accepts a boolean value, or a name and email address. If false, |
| 1343 | format-patch defaults to `--no-from`, using commit authors directly in |
| 1344 | the "From:" field of patch mails. If true, format-patch defaults to |
| 1345 | `--from`, using your committer identity in the "From:" field of patch |
| 1346 | mails and including a "From:" field in the body of the patch mail if |
| 1347 | different. If set to a non-boolean value, format-patch uses that |
| 1348 | value instead of your committer identity. Defaults to false. |
| 1349 | |
| Junio C Hamano | 8c5802d | 2007-11-15 00:13:36 | [diff] [blame] | 1350 | format.numbered:: |
| Junio C Hamano | 7d06a8a | 2008-10-20 05:42:33 | [diff] [blame] | 1351 | A boolean which can enable or disable sequence numbers in patch |
| 1352 | subjects. It defaults to "auto" which enables it only if there |
| 1353 | is more than one patch. It can be enabled or disabled for all |
| 1354 | messages by setting it to "true" or "false". See --numbered |
| 1355 | option in linkgit:git-format-patch[1]. |
| Junio C Hamano | 8c5802d | 2007-11-15 00:13:36 | [diff] [blame] | 1356 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1357 | format.headers:: |
| 1358 | Additional email headers to include in a patch to be submitted |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1359 | by mail. See linkgit:git-format-patch[1]. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1360 | |
| Junio C Hamano | 70664a0 | 2010-07-13 22:48:05 | [diff] [blame] | 1361 | format.to:: |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 1362 | format.cc:: |
| Junio C Hamano | 70664a0 | 2010-07-13 22:48:05 | [diff] [blame] | 1363 | Additional recipients to include in a patch to be submitted |
| 1364 | by mail. See the --to and --cc options in |
| 1365 | linkgit:git-format-patch[1]. |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 1366 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1367 | format.subjectPrefix:: |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 1368 | The default for format-patch is to output files with the '[PATCH]' |
| 1369 | subject prefix. Use this variable to change that prefix. |
| 1370 | |
| Junio C Hamano | 89a5734 | 2010-06-22 23:22:55 | [diff] [blame] | 1371 | format.signature:: |
| 1372 | The default for format-patch is to output a signature containing |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1373 | the Git version number. Use this variable to change that default. |
| Junio C Hamano | 89a5734 | 2010-06-22 23:22:55 | [diff] [blame] | 1374 | Set this variable to the empty string ("") to suppress |
| 1375 | signature generation. |
| 1376 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1377 | format.signatureFile:: |
| Junio C Hamano | c8c398a | 2014-06-16 21:14:05 | [diff] [blame] | 1378 | Works just like format.signature except the contents of the |
| 1379 | file specified by this variable will be used as the signature. |
| 1380 | |
| Junio C Hamano | d4c8e11 | 2007-03-04 10:32:38 | [diff] [blame] | 1381 | format.suffix:: |
| 1382 | The default for format-patch is to output files with the suffix |
| 1383 | `.patch`. Use this variable to change that suffix (make sure to |
| 1384 | include the dot if you want it). |
| 1385 | |
| Junio C Hamano | 86bcccc | 2008-03-08 09:33:55 | [diff] [blame] | 1386 | format.pretty:: |
| 1387 | The default pretty format for log/show/whatchanged command, |
| 1388 | See linkgit:git-log[1], linkgit:git-show[1], |
| 1389 | linkgit:git-whatchanged[1]. |
| 1390 | |
| Junio C Hamano | ea6a764 | 2009-03-11 23:56:19 | [diff] [blame] | 1391 | format.thread:: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1392 | The default threading style for 'git format-patch'. Can be |
| Junio C Hamano | b141a92 | 2010-01-10 19:55:14 | [diff] [blame] | 1393 | a boolean value, or `shallow` or `deep`. `shallow` threading |
| 1394 | makes every mail a reply to the head of the series, |
| Junio C Hamano | ea6a764 | 2009-03-11 23:56:19 | [diff] [blame] | 1395 | where the head is chosen from the cover letter, the |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 1396 | `--in-reply-to`, and the first patch mail, in this order. |
| Junio C Hamano | f458110 | 2009-04-25 08:29:59 | [diff] [blame] | 1397 | `deep` threading makes every mail a reply to the previous one. |
| Junio C Hamano | ea6a764 | 2009-03-11 23:56:19 | [diff] [blame] | 1398 | A true boolean value is the same as `shallow`, and a false |
| 1399 | value disables threading. |
| 1400 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1401 | format.signOff:: |
| Junio C Hamano | 804a974 | 2013-04-28 23:10:31 | [diff] [blame] | 1402 | A boolean value which lets you enable the `-s/--signoff` option of |
| 1403 | format-patch by default. *Note:* Adding the Signed-off-by: line to a |
| 1404 | patch should be a conscious act and means that you certify you have |
| 1405 | the rights to submit this work under the same open source license. |
| 1406 | Please see the 'SubmittingPatches' document for further discussion. |
| Junio C Hamano | 5f9a6f0 | 2009-04-06 08:26:56 | [diff] [blame] | 1407 | |
| Junio C Hamano | ea3b752 | 2013-04-18 19:37:53 | [diff] [blame] | 1408 | format.coverLetter:: |
| 1409 | A boolean that controls whether to generate a cover-letter when |
| 1410 | format-patch is invoked, but in addition can be set to "auto", to |
| 1411 | generate a cover-letter only when there's more than one patch. |
| 1412 | |
| Junio C Hamano | 289d7e8 | 2016-01-27 00:20:38 | [diff] [blame] | 1413 | format.outputDirectory:: |
| 1414 | Set a custom directory to store the resulting files instead of the |
| 1415 | current working directory. |
| 1416 | |
| Junio C Hamano | f2a3a75 | 2016-05-23 22:54:39 | [diff] [blame] | 1417 | format.useAutoBase:: |
| 1418 | A boolean value which lets you enable the `--base=auto` option of |
| 1419 | format-patch by default. |
| 1420 | |
| Junio C Hamano | 209ebe8 | 2011-04-27 21:09:59 | [diff] [blame] | 1421 | filter.<driver>.clean:: |
| 1422 | The command which is used to convert the content of a worktree |
| 1423 | file to a blob upon checkin. See linkgit:gitattributes[5] for |
| 1424 | details. |
| 1425 | |
| 1426 | filter.<driver>.smudge:: |
| 1427 | The command which is used to convert the content of a blob |
| 1428 | object to a worktree file upon checkout. See |
| 1429 | linkgit:gitattributes[5] for details. |
| 1430 | |
| Junio C Hamano | d7ed404 | 2015-08-03 19:43:00 | [diff] [blame] | 1431 | fsck.<msg-id>:: |
| 1432 | Allows overriding the message type (error, warn or ignore) of a |
| 1433 | specific message ID such as `missingEmail`. |
| 1434 | + |
| 1435 | For convenience, fsck prefixes the error/warning with the message ID, |
| 1436 | e.g. "missingEmail: invalid author/committer line - missing email" means |
| 1437 | that setting `fsck.missingEmail = ignore` will hide that issue. |
| 1438 | + |
| 1439 | This feature is intended to support working with legacy repositories |
| 1440 | which cannot be repaired without disruptive changes. |
| 1441 | |
| 1442 | fsck.skipList:: |
| 1443 | The path to a sorted list of object names (i.e. one SHA-1 per |
| 1444 | line) that are known to be broken in a non-fatal way and should |
| 1445 | be ignored. This feature is useful when an established project |
| 1446 | should be accepted despite early commits containing errors that |
| 1447 | can be safely ignored such as invalid committer email addresses. |
| 1448 | Note: corrupt objects cannot be skipped with this setting. |
| 1449 | |
| Junio C Hamano | 624dd4c | 2014-04-03 21:56:30 | [diff] [blame] | 1450 | gc.aggressiveDepth:: |
| 1451 | The depth parameter used in the delta compression |
| 1452 | algorithm used by 'git gc --aggressive'. This defaults |
| Junio C Hamano | 5380048 | 2016-09-21 23:26:43 | [diff] [blame] | 1453 | to 50. |
| Junio C Hamano | 624dd4c | 2014-04-03 21:56:30 | [diff] [blame] | 1454 | |
| Junio C Hamano | f2ce297 | 2007-05-20 19:12:09 | [diff] [blame] | 1455 | gc.aggressiveWindow:: |
| 1456 | The window size parameter used in the delta compression |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1457 | algorithm used by 'git gc --aggressive'. This defaults |
| Junio C Hamano | b04bb3f | 2010-04-14 14:07:36 | [diff] [blame] | 1458 | to 250. |
| Junio C Hamano | f2ce297 | 2007-05-20 19:12:09 | [diff] [blame] | 1459 | |
| Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 1460 | gc.auto:: |
| 1461 | When there are approximately more than this many loose |
| 1462 | objects in the repository, `git gc --auto` will pack them. |
| 1463 | Some Porcelain commands use this command to perform a |
| Junio C Hamano | e77b015 | 2008-01-12 06:44:17 | [diff] [blame] | 1464 | light-weight garbage collection from time to time. The |
| 1465 | default value is 6700. Setting this to 0 disables it. |
| Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 1466 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1467 | gc.autoPackLimit:: |
| Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 1468 | When there are more than this many packs that are not |
| 1469 | marked with `*.keep` file in the repository, `git gc |
| Junio C Hamano | e77b015 | 2008-01-12 06:44:17 | [diff] [blame] | 1470 | --auto` consolidates them into one larger pack. The |
| Junio C Hamano | 25c0b70 | 2008-03-23 09:41:37 | [diff] [blame] | 1471 | default value is 50. Setting this to 0 disables it. |
| Junio C Hamano | 1b50ce9 | 2007-10-03 12:05:53 | [diff] [blame] | 1472 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1473 | gc.autoDetach:: |
| Junio C Hamano | fb5ffde | 2014-11-04 22:38:56 | [diff] [blame] | 1474 | Make `git gc --auto` return immediately and run in background |
| Junio C Hamano | 08ef8c2 | 2014-03-10 14:53:44 | [diff] [blame] | 1475 | if the system supports it. Default is true. |
| 1476 | |
| Junio C Hamano | cbe0eb2 | 2017-02-27 23:37:49 | [diff] [blame] | 1477 | gc.logExpiry:: |
| 1478 | If the file gc.log exists, then `git gc --auto` won't run |
| 1479 | unless that file is more than 'gc.logExpiry' old. Default is |
| 1480 | "1.day". See `gc.pruneExpire` for more ways to specify its |
| 1481 | value. |
| 1482 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1483 | gc.packRefs:: |
| Junio C Hamano | b141a92 | 2010-01-10 19:55:14 | [diff] [blame] | 1484 | Running `git pack-refs` in a repository renders it |
| 1485 | unclonable by Git versions prior to 1.5.1.2 over dumb |
| 1486 | transports such as HTTP. This variable determines whether |
| Junio C Hamano | cdd1c33 | 2010-12-20 10:08:00 | [diff] [blame] | 1487 | 'git gc' runs `git pack-refs`. This can be set to `notbare` |
| Junio C Hamano | b141a92 | 2010-01-10 19:55:14 | [diff] [blame] | 1488 | to enable it within all non-bare repos or it can be set to a |
| 1489 | boolean value. The default is `true`. |
| Junio C Hamano | 9d52e57 | 2007-02-13 23:48:20 | [diff] [blame] | 1490 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1491 | gc.pruneExpire:: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1492 | 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] | 1493 | Override the grace period with this config variable. The value |
| Junio C Hamano | 9c51287 | 2015-08-12 21:59:25 | [diff] [blame] | 1494 | "now" may be used to disable this grace period and always prune |
| 1495 | unreachable objects immediately, or "never" may be used to |
| Junio C Hamano | 56ace3d | 2017-01-10 23:43:41 | [diff] [blame] | 1496 | suppress pruning. This feature helps prevent corruption when |
| 1497 | 'git gc' runs concurrently with another process writing to the |
| 1498 | repository; see the "NOTES" section of linkgit:git-gc[1]. |
| Junio C Hamano | 09a926d | 2008-03-13 07:55:29 | [diff] [blame] | 1499 | |
| Junio C Hamano | 9c51287 | 2015-08-12 21:59:25 | [diff] [blame] | 1500 | gc.worktreePruneExpire:: |
| 1501 | When 'git gc' is run, it calls |
| 1502 | 'git worktree prune --expire 3.months.ago'. |
| 1503 | This config variable can be used to set a different grace |
| 1504 | period. The value "now" may be used to disable the grace |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 1505 | period and prune `$GIT_DIR/worktrees` immediately, or "never" |
| Junio C Hamano | 9c51287 | 2015-08-12 21:59:25 | [diff] [blame] | 1506 | may be used to suppress pruning. |
| Junio C Hamano | 4cc4a84 | 2015-05-11 22:41:02 | [diff] [blame] | 1507 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1508 | gc.reflogExpire:: |
| 1509 | gc.<pattern>.reflogExpire:: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1510 | 'git reflog expire' removes reflog entries older than |
| Junio C Hamano | 9c51287 | 2015-08-12 21:59:25 | [diff] [blame] | 1511 | this time; defaults to 90 days. The value "now" expires all |
| 1512 | entries immediately, and "never" suppresses expiration |
| 1513 | altogether. With "<pattern>" (e.g. |
| Junio C Hamano | cc7636a | 2010-05-21 14:57:53 | [diff] [blame] | 1514 | "refs/stash") in the middle the setting applies only to |
| 1515 | the refs that match the <pattern>. |
| Junio C Hamano | 7464064 | 2006-12-27 10:59:55 | [diff] [blame] | 1516 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1517 | gc.reflogExpireUnreachable:: |
| Junio C Hamano | a1746be | 2015-08-26 23:07:07 | [diff] [blame] | 1518 | gc.<pattern>.reflogExpireUnreachable:: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1519 | 'git reflog expire' removes reflog entries older than |
| Junio C Hamano | 7464064 | 2006-12-27 10:59:55 | [diff] [blame] | 1520 | this time and are not reachable from the current tip; |
| Junio C Hamano | 9c51287 | 2015-08-12 21:59:25 | [diff] [blame] | 1521 | defaults to 30 days. The value "now" expires all entries |
| 1522 | immediately, and "never" suppresses expiration altogether. |
| 1523 | With "<pattern>" (e.g. "refs/stash") |
| Junio C Hamano | cc7636a | 2010-05-21 14:57:53 | [diff] [blame] | 1524 | in the middle, the setting applies only to the refs that |
| 1525 | match the <pattern>. |
| Junio C Hamano | 7464064 | 2006-12-27 10:59:55 | [diff] [blame] | 1526 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1527 | gc.rerereResolved:: |
| Junio C Hamano | 7464064 | 2006-12-27 10:59:55 | [diff] [blame] | 1528 | Records of conflicted merge you resolved earlier are |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1529 | kept for this many days when 'git rerere gc' is run. |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1530 | The default is 60 days. See linkgit:git-rerere[1]. |
| Junio C Hamano | 7464064 | 2006-12-27 10:59:55 | [diff] [blame] | 1531 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1532 | gc.rerereUnresolved:: |
| Junio C Hamano | 7464064 | 2006-12-27 10:59:55 | [diff] [blame] | 1533 | Records of conflicted merge you have not resolved are |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1534 | kept for this many days when 'git rerere gc' is run. |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1535 | The default is 15 days. See linkgit:git-rerere[1]. |
| Junio C Hamano | 7464064 | 2006-12-27 10:59:55 | [diff] [blame] | 1536 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1537 | gitcvs.commitMsgAnnotation:: |
| Junio C Hamano | a3148f5 | 2009-01-14 08:49:57 | [diff] [blame] | 1538 | Append this string to each commit message. Set to empty string |
| 1539 | to disable this feature. Defaults to "via git-CVS emulator". |
| 1540 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1541 | gitcvs.enabled:: |
| Junio C Hamano | a638742 | 2007-08-25 03:54:27 | [diff] [blame] | 1542 | Whether the CVS server interface is enabled for this repository. |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1543 | See linkgit:git-cvsserver[1]. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1544 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1545 | gitcvs.logFile:: |
| Junio C Hamano | a638742 | 2007-08-25 03:54:27 | [diff] [blame] | 1546 | Path to a log file where the CVS server interface well... logs |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1547 | various stuff. See linkgit:git-cvsserver[1]. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1548 | |
| Junio C Hamano | 17bd227 | 2008-09-01 06:11:17 | [diff] [blame] | 1549 | gitcvs.usecrlfattr:: |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 1550 | If true, the server will look up the end-of-line conversion |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 1551 | attributes for files to determine the `-k` modes to use. If |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1552 | the attributes force Git to treat a file as text, |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 1553 | the `-k` mode will be left blank so CVS clients will |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 1554 | treat it as text. If they suppress text conversion, the file |
| Junio C Hamano | cb1c44f | 2008-08-06 06:19:33 | [diff] [blame] | 1555 | will be set with '-kb' mode, which suppresses any newline munging |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 1556 | the client might otherwise do. If the attributes do not allow |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1557 | the file type to be determined, then `gitcvs.allBinary` is |
| Junio C Hamano | bb88cf4 | 2010-06-21 15:23:55 | [diff] [blame] | 1558 | used. See linkgit:gitattributes[5]. |
| Junio C Hamano | dfccbb0 | 2008-05-26 01:16:14 | [diff] [blame] | 1559 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1560 | gitcvs.allBinary:: |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1561 | This is used if `gitcvs.usecrlfattr` does not resolve |
| Junio C Hamano | dfccbb0 | 2008-05-26 01:16:14 | [diff] [blame] | 1562 | the correct '-kb' mode to use. If true, all |
| 1563 | unresolved files are sent to the client in |
| 1564 | mode '-kb'. This causes the client to treat them |
| 1565 | as binary files, which suppresses any newline munging it |
| 1566 | otherwise might do. Alternatively, if it is set to "guess", |
| 1567 | then the contents of the file are examined to decide if |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1568 | it is binary, similar to `core.autocrlf`. |
| Junio C Hamano | a2ad99e | 2007-04-18 09:57:04 | [diff] [blame] | 1569 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1570 | gitcvs.dbName:: |
| Junio C Hamano | a2ad99e | 2007-04-18 09:57:04 | [diff] [blame] | 1571 | Database used by git-cvsserver to cache revision information |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1572 | derived from the Git repository. The exact meaning depends on the |
| Junio C Hamano | a2ad99e | 2007-04-18 09:57:04 | [diff] [blame] | 1573 | used database driver, for SQLite (which is the default driver) this |
| 1574 | is a filename. Supports variable substitution (see |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1575 | linkgit:git-cvsserver[1] for details). May not contain semicolons (`;`). |
| Junio C Hamano | a2ad99e | 2007-04-18 09:57:04 | [diff] [blame] | 1576 | Default: '%Ggitcvs.%m.sqlite' |
| 1577 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1578 | gitcvs.dbDriver:: |
| Junio C Hamano | a2ad99e | 2007-04-18 09:57:04 | [diff] [blame] | 1579 | Used Perl DBI driver. You can specify any available driver |
| Junio C Hamano | 804a974 | 2013-04-28 23:10:31 | [diff] [blame] | 1580 | for this here, but it might not work. git-cvsserver is tested |
| Junio C Hamano | a2ad99e | 2007-04-18 09:57:04 | [diff] [blame] | 1581 | with 'DBD::SQLite', reported to work with 'DBD::Pg', and |
| 1582 | reported *not* to work with 'DBD::mysql'. Experimental feature. |
| 1583 | May not contain double colons (`:`). Default: 'SQLite'. |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1584 | See linkgit:git-cvsserver[1]. |
| Junio C Hamano | d9e0e5d | 2007-04-14 16:22:04 | [diff] [blame] | 1585 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1586 | gitcvs.dbUser, gitcvs.dbPass:: |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1587 | Database user and password. Only useful if setting `gitcvs.dbDriver`, |
| Junio C Hamano | a2ad99e | 2007-04-18 09:57:04 | [diff] [blame] | 1588 | since SQLite has no concept of database users and/or passwords. |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1589 | 'gitcvs.dbUser' supports variable substitution (see |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 1590 | linkgit:git-cvsserver[1] for details). |
| Junio C Hamano | a2ad99e | 2007-04-18 09:57:04 | [diff] [blame] | 1591 | |
| Junio C Hamano | a74efce | 2008-04-02 08:39:08 | [diff] [blame] | 1592 | gitcvs.dbTableNamePrefix:: |
| 1593 | Database table name prefix. Prepended to the names of any |
| 1594 | database tables used, allowing a single database to be used |
| 1595 | for several repositories. Supports variable substitution (see |
| 1596 | linkgit:git-cvsserver[1] for details). Any non-alphabetic |
| 1597 | characters will be replaced with underscores. |
| 1598 | |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1599 | All gitcvs variables except for `gitcvs.usecrlfattr` and |
| 1600 | `gitcvs.allBinary` can also be specified as |
| Junio C Hamano | dfccbb0 | 2008-05-26 01:16:14 | [diff] [blame] | 1601 | 'gitcvs.<access_method>.<varname>' (where 'access_method' |
| Junio C Hamano | a638742 | 2007-08-25 03:54:27 | [diff] [blame] | 1602 | is one of "ext" and "pserver") to make them apply only for the given |
| 1603 | access method. |
| Junio C Hamano | a2ad99e | 2007-04-18 09:57:04 | [diff] [blame] | 1604 | |
| Junio C Hamano | 11821ed | 2011-10-19 18:42:09 | [diff] [blame] | 1605 | gitweb.category:: |
| 1606 | gitweb.description:: |
| 1607 | gitweb.owner:: |
| 1608 | gitweb.url:: |
| 1609 | See linkgit:gitweb[1] for description. |
| 1610 | |
| 1611 | gitweb.avatar:: |
| 1612 | gitweb.blame:: |
| 1613 | gitweb.grep:: |
| 1614 | gitweb.highlight:: |
| 1615 | gitweb.patches:: |
| 1616 | gitweb.pickaxe:: |
| 1617 | gitweb.remote_heads:: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1618 | gitweb.showSizes:: |
| Junio C Hamano | 11821ed | 2011-10-19 18:42:09 | [diff] [blame] | 1619 | gitweb.snapshot:: |
| 1620 | See linkgit:gitweb.conf[5] for description. |
| 1621 | |
| Junio C Hamano | a03ac86 | 2011-04-02 04:32:29 | [diff] [blame] | 1622 | grep.lineNumber:: |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 1623 | If set to true, enable `-n` option by default. |
| Junio C Hamano | a03ac86 | 2011-04-02 04:32:29 | [diff] [blame] | 1624 | |
| Junio C Hamano | a00504d | 2012-08-27 21:11:23 | [diff] [blame] | 1625 | grep.patternType:: |
| 1626 | Set the default matching behavior. Using a value of 'basic', 'extended', |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 1627 | 'fixed', or 'perl' will enable the `--basic-regexp`, `--extended-regexp`, |
| 1628 | `--fixed-strings`, or `--perl-regexp` option accordingly, while the |
| Junio C Hamano | a00504d | 2012-08-27 21:11:23 | [diff] [blame] | 1629 | value 'default' will return to the default matching behavior. |
| 1630 | |
| Junio C Hamano | a03ac86 | 2011-04-02 04:32:29 | [diff] [blame] | 1631 | grep.extendedRegexp:: |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 1632 | If set to true, enable `--extended-regexp` option by default. This |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1633 | option is ignored when the `grep.patternType` option is set to a value |
| Junio C Hamano | a00504d | 2012-08-27 21:11:23 | [diff] [blame] | 1634 | other than 'default'. |
| Junio C Hamano | a03ac86 | 2011-04-02 04:32:29 | [diff] [blame] | 1635 | |
| Junio C Hamano | a7da1ba | 2016-01-13 00:19:45 | [diff] [blame] | 1636 | grep.threads:: |
| 1637 | Number of grep worker threads to use. |
| 1638 | See `grep.threads` in linkgit:git-grep[1] for more information. |
| 1639 | |
| Junio C Hamano | 4e6ba27 | 2016-01-20 23:23:19 | [diff] [blame] | 1640 | grep.fallbackToNoIndex:: |
| 1641 | If set to true, fall back to git grep --no-index if git grep |
| 1642 | is executed outside of a git repository. Defaults to false. |
| 1643 | |
| Junio C Hamano | 4fd2442 | 2012-01-06 21:52:43 | [diff] [blame] | 1644 | gpg.program:: |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 1645 | Use this custom program instead of "`gpg`" found on `$PATH` when |
| Junio C Hamano | 4fd2442 | 2012-01-06 21:52:43 | [diff] [blame] | 1646 | making or verifying a PGP signature. The program must support the |
| Junio C Hamano | e1aeb5e | 2014-06-06 19:16:29 | [diff] [blame] | 1647 | same command-line interface as GPG, namely, to verify a detached |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 1648 | signature, "`gpg --verify $file - <$signature`" is run, and the |
| Junio C Hamano | 4fd2442 | 2012-01-06 21:52:43 | [diff] [blame] | 1649 | program is expected to signal a good signature by exiting with |
| Junio C Hamano | fb5ffde | 2014-11-04 22:38:56 | [diff] [blame] | 1650 | code 0, and to generate an ASCII-armored detached signature, the |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 1651 | standard input of "`gpg -bsau $key`" is fed with the contents to be |
| Junio C Hamano | 4fd2442 | 2012-01-06 21:52:43 | [diff] [blame] | 1652 | signed, and the program is expected to send the result to its |
| 1653 | standard output. |
| 1654 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1655 | gui.commitMsgWidth:: |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 1656 | Defines how wide the commit message window is in the |
| 1657 | linkgit:git-gui[1]. "75" is the default. |
| 1658 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1659 | gui.diffContext:: |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 1660 | Specifies how many context lines should be used in calls to diff |
| 1661 | made by the linkgit:git-gui[1]. The default is "5". |
| 1662 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1663 | gui.displayUntracked:: |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 1664 | Determines if linkgit:git-gui[1] shows untracked files |
| Junio C Hamano | 796c55f | 2014-05-02 21:45:15 | [diff] [blame] | 1665 | in the file list. The default is "true". |
| 1666 | |
| Junio C Hamano | d3452a0 | 2008-11-15 08:07:55 | [diff] [blame] | 1667 | gui.encoding:: |
| 1668 | Specifies the default encoding to use for displaying of |
| 1669 | file contents in linkgit:git-gui[1] and linkgit:gitk[1]. |
| 1670 | It can be overridden by setting the 'encoding' attribute |
| 1671 | for relevant files (see linkgit:gitattributes[5]). |
| 1672 | If this option is not set, the tools default to the |
| 1673 | locale encoding. |
| 1674 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1675 | gui.matchTrackingBranch:: |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 1676 | Determines if new branches created with linkgit:git-gui[1] should |
| 1677 | default to tracking remote branches with matching names or |
| 1678 | not. Default: "false". |
| 1679 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1680 | gui.newBranchTemplate:: |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 1681 | Is used as suggested name when creating new branches using the |
| 1682 | linkgit:git-gui[1]. |
| 1683 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1684 | gui.pruneDuringFetch:: |
| Junio C Hamano | 97bcb48 | 2010-11-25 03:16:07 | [diff] [blame] | 1685 | "true" if linkgit:git-gui[1] should prune remote-tracking branches when |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 1686 | performing a fetch. The default value is "false". |
| 1687 | |
| 1688 | gui.trustmtime:: |
| 1689 | Determines if linkgit:git-gui[1] should trust the file modification |
| 1690 | timestamp or not. By default the timestamps are not trusted. |
| 1691 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1692 | gui.spellingDictionary:: |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 1693 | Specifies the dictionary used for spell checking commit messages in |
| 1694 | the linkgit:git-gui[1]. When set to "none" spell checking is turned |
| 1695 | off. |
| 1696 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1697 | gui.fastCopyBlame:: |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 1698 | 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] | 1699 | location detection. It makes blame significantly faster on huge |
| 1700 | repositories at the expense of less thorough copy detection. |
| 1701 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1702 | gui.copyBlameThreshold:: |
| Junio C Hamano | 610d176 | 2008-11-28 06:27:13 | [diff] [blame] | 1703 | Specifies the threshold to use in 'git gui blame' original location |
| Junio C Hamano | d3452a0 | 2008-11-15 08:07:55 | [diff] [blame] | 1704 | detection, measured in alphanumeric characters. See the |
| 1705 | linkgit:git-blame[1] manual for more information on copy detection. |
| 1706 | |
| 1707 | gui.blamehistoryctx:: |
| 1708 | Specifies the radius of history context in days to show in |
| 1709 | linkgit:gitk[1] for the selected commit, when the `Show History |
| 1710 | Context` menu item is invoked from 'git gui blame'. If this |
| 1711 | variable is set to zero, the whole history is shown. |
| 1712 | |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1713 | guitool.<name>.cmd:: |
| 1714 | Specifies the shell command line to execute when the corresponding item |
| 1715 | of the linkgit:git-gui[1] `Tools` menu is invoked. This option is |
| 1716 | mandatory for every tool. The command is executed from the root of |
| 1717 | the working directory, and in the environment it receives the name of |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1718 | the tool as `GIT_GUITOOL`, the name of the currently selected file as |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1719 | 'FILENAME', and the name of the current branch as 'CUR_BRANCH' (if |
| 1720 | the head is detached, 'CUR_BRANCH' is empty). |
| 1721 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1722 | guitool.<name>.needsFile:: |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1723 | Run the tool only if a diff is selected in the GUI. It guarantees |
| 1724 | that 'FILENAME' is not empty. |
| 1725 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1726 | guitool.<name>.noConsole:: |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1727 | Run the command silently, without creating a window to display its |
| 1728 | output. |
| 1729 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1730 | guitool.<name>.noRescan:: |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1731 | Don't rescan the working directory for changes after the tool |
| 1732 | finishes execution. |
| 1733 | |
| 1734 | guitool.<name>.confirm:: |
| 1735 | Show a confirmation dialog before actually running the tool. |
| 1736 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1737 | guitool.<name>.argPrompt:: |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1738 | Request a string argument from the user, and pass it to the tool |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1739 | through the `ARGS` environment variable. Since requesting an |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1740 | argument implies confirmation, the 'confirm' option has no effect |
| 1741 | if this is enabled. If the option is set to 'true', 'yes', or '1', |
| 1742 | the dialog uses a built-in generic prompt; otherwise the exact |
| 1743 | value of the variable is used. |
| 1744 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1745 | guitool.<name>.revPrompt:: |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1746 | Request a single valid revision from the user, and set the |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1747 | `REVISION` environment variable. In other aspects this option |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1748 | is similar to 'argPrompt', and can be used together with it. |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1749 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1750 | guitool.<name>.revUnmerged:: |
| 1751 | Show only unmerged branches in the 'revPrompt' subdialog. |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1752 | This is useful for tools similar to merge or rebase, but not |
| 1753 | for things like checkout or reset. |
| 1754 | |
| 1755 | guitool.<name>.title:: |
| 1756 | Specifies the title to use for the prompt dialog. The default |
| 1757 | is the tool name. |
| 1758 | |
| 1759 | guitool.<name>.prompt:: |
| 1760 | Specifies the general prompt string to display at the top of |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1761 | the dialog, before subsections for 'argPrompt' and 'revPrompt'. |
| Junio C Hamano | 92d312a | 2008-12-15 07:22:20 | [diff] [blame] | 1762 | The default value includes the actual command. |
| 1763 | |
| Junio C Hamano | 4e27231 | 2008-01-08 09:13:21 | [diff] [blame] | 1764 | help.browser:: |
| 1765 | Specify the browser that will be used to display help in the |
| 1766 | 'web' format. See linkgit:git-help[1]. |
| 1767 | |
| 1768 | help.format:: |
| 1769 | Override the default help format used by linkgit:git-help[1]. |
| 1770 | Values 'man', 'info', 'web' and 'html' are supported. 'man' is |
| 1771 | the default. 'web' and 'html' are the same. |
| 1772 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1773 | help.autoCorrect:: |
| Junio C Hamano | f24b806 | 2008-09-09 01:34:39 | [diff] [blame] | 1774 | Automatically correct and execute mistyped commands after |
| 1775 | waiting for the given number of deciseconds (0.1 sec). If more |
| 1776 | than one command can be deduced from the entered text, nothing |
| 1777 | will be executed. If the value of this option is negative, |
| 1778 | the corrected command will be executed immediately. If the |
| 1779 | value is 0 - the command will be just shown but not executed. |
| 1780 | This is the default. |
| 1781 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1782 | help.htmlPath:: |
| Junio C Hamano | 5dd5fae | 2013-01-18 21:06:49 | [diff] [blame] | 1783 | Specify the path where the HTML documentation resides. File system paths |
| 1784 | and URLs are supported. HTML pages will be prefixed with this path when |
| 1785 | help is displayed in the 'web' format. This defaults to the documentation |
| 1786 | path of your Git installation. |
| 1787 | |
| Junio C Hamano | 5825687 | 2007-12-04 08:31:13 | [diff] [blame] | 1788 | http.proxy:: |
| Junio C Hamano | 3dd9392 | 2012-03-05 07:49:11 | [diff] [blame] | 1789 | Override the HTTP proxy, normally configured using the 'http_proxy', |
| Junio C Hamano | ffe10ca | 2016-02-04 00:44:23 | [diff] [blame] | 1790 | 'https_proxy', and 'all_proxy' environment variables (see `curl(1)`). In |
| 1791 | addition to the syntax understood by curl, it is possible to specify a |
| 1792 | proxy string with a user name but no password, in which case git will |
| 1793 | attempt to acquire one in the same way it does for other credentials. See |
| 1794 | linkgit:gitcredentials[7] for more information. The syntax thus is |
| 1795 | '[protocol://][user[:password]@]proxyhost[:port]'. This can be overridden |
| 1796 | on a per-remote basis; see remote.<name>.proxy |
| 1797 | |
| 1798 | http.proxyAuthMethod:: |
| 1799 | Set the method with which to authenticate against the HTTP proxy. This |
| 1800 | only takes effect if the configured proxy string contains a user name part |
| 1801 | (i.e. is of the form 'user@host' or 'user@host:port'). This can be |
| 1802 | overridden on a per-remote basis; see `remote.<name>.proxyAuthMethod`. |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1803 | Both can be overridden by the `GIT_HTTP_PROXY_AUTHMETHOD` environment |
| Junio C Hamano | ffe10ca | 2016-02-04 00:44:23 | [diff] [blame] | 1804 | variable. Possible values are: |
| 1805 | + |
| 1806 | -- |
| 1807 | * `anyauth` - Automatically pick a suitable authentication method. It is |
| 1808 | assumed that the proxy answers an unauthenticated request with a 407 |
| 1809 | status code and one or more Proxy-authenticate headers with supported |
| 1810 | authentication methods. This is the default. |
| 1811 | * `basic` - HTTP Basic authentication |
| 1812 | * `digest` - HTTP Digest authentication; this prevents the password from being |
| 1813 | transmitted to the proxy in clear text |
| 1814 | * `negotiate` - GSS-Negotiate authentication (compare the --negotiate option |
| 1815 | of `curl(1)`) |
| 1816 | * `ntlm` - NTLM authentication (compare the --ntlm option of `curl(1)`) |
| 1817 | -- |
| Junio C Hamano | 5825687 | 2007-12-04 08:31:13 | [diff] [blame] | 1818 | |
| Junio C Hamano | 3fcdd07 | 2016-02-24 23:41:08 | [diff] [blame] | 1819 | http.emptyAuth:: |
| 1820 | Attempt authentication without seeking a username or password. This |
| 1821 | can be used to attempt GSS-Negotiate authentication without specifying |
| 1822 | a username in the URL, as libcurl normally requires a username for |
| 1823 | authentication. |
| 1824 | |
| Junio C Hamano | 34afdb2 | 2016-10-06 22:16:39 | [diff] [blame] | 1825 | http.delegation:: |
| 1826 | Control GSSAPI credential delegation. The delegation is disabled |
| 1827 | by default in libcurl since version 7.21.7. Set parameter to tell |
| 1828 | the server what it is allowed to delegate when it comes to user |
| 1829 | credentials. Used with GSS/kerberos. Possible values are: |
| 1830 | + |
| 1831 | -- |
| 1832 | * `none` - Don't allow any delegation. |
| 1833 | * `policy` - Delegates if and only if the OK-AS-DELEGATE flag is set in the |
| 1834 | Kerberos service ticket, which is a matter of realm policy. |
| 1835 | * `always` - Unconditionally allow the server to delegate. |
| 1836 | -- |
| 1837 | |
| 1838 | |
| Junio C Hamano | ccdabca | 2016-05-06 22:27:09 | [diff] [blame] | 1839 | http.extraHeader:: |
| 1840 | Pass an additional HTTP header when communicating with a server. If |
| 1841 | more than one such entry exists, all of them are added as extra |
| 1842 | headers. To allow overriding the settings inherited from the system |
| 1843 | config, an empty value will reset the extra headers to the empty list. |
| 1844 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1845 | http.cookieFile:: |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 1846 | The pathname of a file containing previously stored cookie lines, |
| 1847 | which should be used |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1848 | in the Git http session, if they match the server. The file format |
| Junio C Hamano | 4c4b012 | 2011-06-30 01:19:32 | [diff] [blame] | 1849 | of the file to read cookies from should be plain HTTP headers or |
| Junio C Hamano | 198b1f1 | 2016-05-17 22:27:24 | [diff] [blame] | 1850 | the Netscape/Mozilla cookie file format (see `curl(1)`). |
| 1851 | NOTE that the file specified with http.cookieFile is used only as |
| Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 1852 | input unless http.saveCookies is set. |
| 1853 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1854 | http.saveCookies:: |
| Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 1855 | If set, store cookies received during requests to the file specified by |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1856 | http.cookieFile. Has no effect if http.cookieFile is unset. |
| Junio C Hamano | 4c4b012 | 2011-06-30 01:19:32 | [diff] [blame] | 1857 | |
| Junio C Hamano | a1746be | 2015-08-26 23:07:07 | [diff] [blame] | 1858 | http.sslVersion:: |
| 1859 | The SSL version to use when negotiating an SSL connection, if you |
| 1860 | want to force the default. The available and default version |
| 1861 | depend on whether libcurl was built against NSS or OpenSSL and the |
| 1862 | particular configuration of the crypto library in use. Internally |
| 1863 | this sets the 'CURLOPT_SSL_VERSION' option; see the libcurl |
| 1864 | documentation for more details on the format of this option and |
| 1865 | for the ssl version supported. Actually the possible values of |
| 1866 | this option are: |
| 1867 | |
| 1868 | - sslv2 |
| 1869 | - sslv3 |
| 1870 | - tlsv1 |
| 1871 | - tlsv1.0 |
| 1872 | - tlsv1.1 |
| 1873 | - tlsv1.2 |
| 1874 | |
| 1875 | + |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1876 | Can be overridden by the `GIT_SSL_VERSION` environment variable. |
| Junio C Hamano | a1746be | 2015-08-26 23:07:07 | [diff] [blame] | 1877 | To force git to use libcurl's default ssl version and ignore any |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1878 | explicit http.sslversion option, set `GIT_SSL_VERSION` to the |
| Junio C Hamano | a1746be | 2015-08-26 23:07:07 | [diff] [blame] | 1879 | empty string. |
| 1880 | |
| Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 1881 | http.sslCipherList:: |
| 1882 | A list of SSL ciphers to use when negotiating an SSL connection. |
| 1883 | The available ciphers depend on whether libcurl was built against |
| 1884 | NSS or OpenSSL and the particular configuration of the crypto |
| 1885 | library in use. Internally this sets the 'CURLOPT_SSL_CIPHER_LIST' |
| 1886 | option; see the libcurl documentation for more details on the format |
| 1887 | of this list. |
| 1888 | + |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1889 | Can be overridden by the `GIT_SSL_CIPHER_LIST` environment variable. |
| Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 1890 | To force git to use libcurl's default cipher list and ignore any |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1891 | explicit http.sslCipherList option, set `GIT_SSL_CIPHER_LIST` to the |
| Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 1892 | empty string. |
| 1893 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1894 | http.sslVerify:: |
| 1895 | Whether to verify the SSL certificate when fetching or pushing |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1896 | over HTTPS. Can be overridden by the `GIT_SSL_NO_VERIFY` environment |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1897 | variable. |
| 1898 | |
| 1899 | http.sslCert:: |
| 1900 | File containing the SSL certificate when fetching or pushing |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1901 | over HTTPS. Can be overridden by the `GIT_SSL_CERT` environment |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1902 | variable. |
| 1903 | |
| 1904 | http.sslKey:: |
| 1905 | File containing the SSL private key when fetching or pushing |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1906 | over HTTPS. Can be overridden by the `GIT_SSL_KEY` environment |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1907 | variable. |
| 1908 | |
| Junio C Hamano | 48bc1ce | 2009-07-09 16:49:19 | [diff] [blame] | 1909 | http.sslCertPasswordProtected:: |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1910 | Enable Git's password prompt for the SSL certificate. Otherwise |
| Junio C Hamano | 48bc1ce | 2009-07-09 16:49:19 | [diff] [blame] | 1911 | OpenSSL will prompt the user, possibly many times, if the |
| 1912 | certificate or private key is encrypted. Can be overridden by the |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1913 | `GIT_SSL_CERT_PASSWORD_PROTECTED` environment variable. |
| Junio C Hamano | 48bc1ce | 2009-07-09 16:49:19 | [diff] [blame] | 1914 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1915 | http.sslCAInfo:: |
| 1916 | File containing the certificates to verify the peer with when |
| Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 1917 | fetching or pushing over HTTPS. Can be overridden by the |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1918 | `GIT_SSL_CAINFO` environment variable. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1919 | |
| 1920 | http.sslCAPath:: |
| 1921 | Path containing files with the CA certificates to verify the peer |
| Junio C Hamano | 33db437 | 2006-06-07 19:51:45 | [diff] [blame] | 1922 | with when fetching or pushing over HTTPS. Can be overridden |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1923 | by the `GIT_SSL_CAPATH` environment variable. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1924 | |
| Junio C Hamano | 3fcdd07 | 2016-02-24 23:41:08 | [diff] [blame] | 1925 | http.pinnedpubkey:: |
| 1926 | Public key of the https service. It may either be the filename of |
| 1927 | a PEM or DER encoded public key file or a string starting with |
| 1928 | 'sha256//' followed by the base64 encoded sha256 hash of the |
| 1929 | public key. See also libcurl 'CURLOPT_PINNEDPUBLICKEY'. git will |
| 1930 | exit with an error if this option is set but not supported by |
| 1931 | cURL. |
| 1932 | |
| Junio C Hamano | 7692782 | 2013-04-19 21:26:57 | [diff] [blame] | 1933 | http.sslTry:: |
| 1934 | Attempt to use AUTH SSL/TLS and encrypted data transfers |
| 1935 | when connecting via regular FTP protocol. This might be needed |
| 1936 | if the FTP server requires it for security reasons or you wish |
| 1937 | to connect securely whenever remote FTP server supports it. |
| 1938 | Default is false since it might trigger certificate verification |
| 1939 | errors on misconfigured servers. |
| 1940 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1941 | http.maxRequests:: |
| Junio C Hamano | 341071d | 2006-06-04 07:24:48 | [diff] [blame] | 1942 | How many HTTP requests to launch in parallel. Can be overridden |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1943 | by the `GIT_HTTP_MAX_REQUESTS` environment variable. Default is 5. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1944 | |
| Junio C Hamano | b141a92 | 2010-01-10 19:55:14 | [diff] [blame] | 1945 | http.minSessions:: |
| 1946 | The number of curl sessions (counted across slots) to be kept across |
| 1947 | requests. They will not be ended with curl_easy_cleanup() until |
| 1948 | http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this |
| 1949 | value will be capped at 1. Defaults to 1. |
| 1950 | |
| Junio C Hamano | 3b70d3c | 2009-11-21 17:37:37 | [diff] [blame] | 1951 | http.postBuffer:: |
| 1952 | Maximum size in bytes of the buffer used by smart HTTP |
| 1953 | transports when POSTing data to the remote system. |
| 1954 | For requests larger than this buffer size, HTTP/1.1 and |
| 1955 | Transfer-Encoding: chunked is used to avoid creating a |
| 1956 | massive pack file locally. Default is 1 MiB, which is |
| 1957 | sufficient for most requests. |
| 1958 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1959 | http.lowSpeedLimit, http.lowSpeedTime:: |
| 1960 | If the HTTP transfer speed is less than 'http.lowSpeedLimit' |
| 1961 | for longer than 'http.lowSpeedTime' seconds, the transfer is aborted. |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1962 | Can be overridden by the `GIT_HTTP_LOW_SPEED_LIMIT` and |
| 1963 | `GIT_HTTP_LOW_SPEED_TIME` environment variables. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 1964 | |
| Junio C Hamano | f1dcdfe | 2006-09-29 08:10:51 | [diff] [blame] | 1965 | http.noEPSV:: |
| 1966 | A boolean which disables using of EPSV ftp command by curl. |
| Junio C Hamano | d9e0e5d | 2007-04-14 16:22:04 | [diff] [blame] | 1967 | This can helpful with some "poor" ftp servers which don't |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1968 | support EPSV mode. Can be overridden by the `GIT_CURL_FTP_NO_EPSV` |
| Junio C Hamano | f1dcdfe | 2006-09-29 08:10:51 | [diff] [blame] | 1969 | environment variable. Default is false (curl will use EPSV). |
| 1970 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 1971 | http.userAgent:: |
| Junio C Hamano | 53ba6d0 | 2010-08-22 07:25:12 | [diff] [blame] | 1972 | The HTTP USER_AGENT string presented to an HTTP server. The default |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 1973 | value represents the version of the client Git such as git/1.7.1. |
| Junio C Hamano | 53ba6d0 | 2010-08-22 07:25:12 | [diff] [blame] | 1974 | This option allows you to override this value to a more common value |
| 1975 | such as Mozilla/4.0. This may be necessary, for instance, if |
| 1976 | connecting through a firewall that restricts HTTP connections to a set |
| 1977 | of common USER_AGENT strings (but not including those like git/1.7.1). |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 1978 | Can be overridden by the `GIT_HTTP_USER_AGENT` environment variable. |
| Junio C Hamano | 53ba6d0 | 2010-08-22 07:25:12 | [diff] [blame] | 1979 | |
| Junio C Hamano | 52b1cfb | 2016-12-20 00:18:36 | [diff] [blame] | 1980 | http.followRedirects:: |
| 1981 | Whether git should follow HTTP redirects. If set to `true`, git |
| 1982 | will transparently follow any redirect issued by a server it |
| 1983 | encounters. If set to `false`, git will treat all redirects as |
| 1984 | errors. If set to `initial`, git will follow redirects only for |
| 1985 | the initial request to a remote, but not for subsequent |
| 1986 | follow-up HTTP requests. Since git uses the redirected URL as |
| 1987 | the base for the follow-up requests, this is generally |
| 1988 | sufficient. The default is `initial`. |
| 1989 | |
| Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 1990 | http.<url>.*:: |
| Junio C Hamano | fb5ffde | 2014-11-04 22:38:56 | [diff] [blame] | 1991 | Any of the http.* options above can be applied selectively to some URLs. |
| Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 1992 | For a config key to match a URL, each element of the config key is |
| 1993 | compared to that of the URL, in the following order: |
| 1994 | + |
| 1995 | -- |
| 1996 | . Scheme (e.g., `https` in `https://example.com/`). This field |
| 1997 | must match exactly between the config key and the URL. |
| 1998 | |
| 1999 | . Host/domain name (e.g., `example.com` in `https://example.com/`). |
| Junio C Hamano | cbe0eb2 | 2017-02-27 23:37:49 | [diff] [blame] | 2000 | This field must match between the config key and the URL. It is |
| 2001 | possible to specify a `*` as part of the host name to match all subdomains |
| 2002 | at this level. `https://*.example.com/` for example would match |
| 2003 | `https://foo.example.com/`, but not `https://foo.bar.example.com/`. |
| Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 2004 | |
| 2005 | . Port number (e.g., `8080` in `http://example.com:8080/`). |
| 2006 | This field must match exactly between the config key and the URL. |
| 2007 | Omitted port numbers are automatically converted to the correct |
| 2008 | default for the scheme before matching. |
| 2009 | |
| 2010 | . Path (e.g., `repo.git` in `https://example.com/repo.git`). The |
| 2011 | path field of the config key must match the path field of the URL |
| 2012 | either exactly or as a prefix of slash-delimited path elements. This means |
| 2013 | a config key with path `foo/` matches URL path `foo/bar`. A prefix can only |
| 2014 | match on a slash (`/`) boundary. Longer matches take precedence (so a config |
| 2015 | key with path `foo/bar` is a better match to URL path `foo/bar` than a config |
| 2016 | key with just path `foo/`). |
| 2017 | |
| 2018 | . User name (e.g., `user` in `https://user@example.com/repo.git`). If |
| 2019 | the config key has a user name it must match the user name in the |
| 2020 | URL exactly. If the config key does not have a user name, that |
| 2021 | config key will match a URL with any user name (including none), |
| 2022 | but at a lower precedence than a config key with a user name. |
| 2023 | -- |
| 2024 | + |
| 2025 | The list above is ordered by decreasing precedence; a URL that matches |
| 2026 | a config key's path is preferred to one that matches its user name. For example, |
| 2027 | if the URL is `https://user@example.com/foo/bar` a config key match of |
| 2028 | `https://example.com/foo` will be preferred over a config key match of |
| 2029 | `https://user@example.com`. |
| 2030 | + |
| 2031 | All URLs are normalized before attempting any matching (the password part, |
| 2032 | if embedded in the URL, is always ignored for matching purposes) so that |
| Junio C Hamano | fb5ffde | 2014-11-04 22:38:56 | [diff] [blame] | 2033 | equivalent URLs that are simply spelled differently will match properly. |
| 2034 | Environment variable settings always override any matches. The URLs that are |
| Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 2035 | matched against are those given directly to Git commands. This means any URLs |
| 2036 | visited as a result of a redirection do not participate in matching. |
| 2037 | |
| Junio C Hamano | cbe0eb2 | 2017-02-27 23:37:49 | [diff] [blame] | 2038 | ssh.variant:: |
| 2039 | Depending on the value of the environment variables `GIT_SSH` or |
| 2040 | `GIT_SSH_COMMAND`, or the config setting `core.sshCommand`, Git |
| 2041 | auto-detects whether to adjust its command-line parameters for use |
| 2042 | with plink or tortoiseplink, as opposed to the default (OpenSSH). |
| 2043 | + |
| 2044 | The config variable `ssh.variant` can be set to override this auto-detection; |
| 2045 | valid values are `ssh`, `plink`, `putty` or `tortoiseplink`. Any other value |
| 2046 | will be treated as normal ssh. This setting can be overridden via the |
| 2047 | environment variable `GIT_SSH_VARIANT`. |
| 2048 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 2049 | i18n.commitEncoding:: |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2050 | Character encoding the commit messages are stored in; Git itself |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 2051 | does not care per se, but this information is necessary e.g. when |
| 2052 | importing commits from emails or in the gitk graphical history |
| 2053 | browser (and possibly at other places in the future or in other |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2054 | porcelains). See e.g. linkgit:git-mailinfo[1]. Defaults to 'utf-8'. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 2055 | |
| Junio C Hamano | 51f92e2 | 2006-12-29 05:18:28 | [diff] [blame] | 2056 | i18n.logOutputEncoding:: |
| 2057 | Character encoding the commit messages are converted to when |
| Junio C Hamano | 1aa40d2 | 2010-01-21 17:46:43 | [diff] [blame] | 2058 | running 'git log' and friends. |
| Junio C Hamano | 51f92e2 | 2006-12-29 05:18:28 | [diff] [blame] | 2059 | |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2060 | imap:: |
| 2061 | The configuration variables in the 'imap' section are described |
| 2062 | in linkgit:git-imap-send[1]. |
| 2063 | |
| Junio C Hamano | 81703b2 | 2014-03-14 22:00:27 | [diff] [blame] | 2064 | index.version:: |
| 2065 | Specify the version with which new index files should be |
| 2066 | initialized. This does not affect existing repositories. |
| 2067 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2068 | init.templateDir:: |
| Junio C Hamano | caa712a | 2010-03-11 01:17:35 | [diff] [blame] | 2069 | Specify the directory from which templates will be copied. |
| 2070 | (See the "TEMPLATE DIRECTORY" section of linkgit:git-init[1].) |
| 2071 | |
| Junio C Hamano | 4e27231 | 2008-01-08 09:13:21 | [diff] [blame] | 2072 | instaweb.browser:: |
| 2073 | Specify the program that will be used to browse your working |
| 2074 | repository in gitweb. See linkgit:git-instaweb[1]. |
| 2075 | |
| 2076 | instaweb.httpd:: |
| 2077 | The HTTP daemon command-line to start gitweb on your working |
| 2078 | repository. See linkgit:git-instaweb[1]. |
| 2079 | |
| 2080 | instaweb.local:: |
| 2081 | If true the web server started by linkgit:git-instaweb[1] will |
| 2082 | be bound to the local IP (127.0.0.1). |
| 2083 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2084 | instaweb.modulePath:: |
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 2085 | The default module path for linkgit:git-instaweb[1] to use |
| 2086 | instead of /usr/lib/apache2/modules. Only used if httpd |
| 2087 | is Apache. |
| Junio C Hamano | 4e27231 | 2008-01-08 09:13:21 | [diff] [blame] | 2088 | |
| 2089 | instaweb.port:: |
| 2090 | The port number to bind the gitweb httpd to. See |
| 2091 | linkgit:git-instaweb[1]. |
| 2092 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2093 | interactive.singleKey:: |
| Junio C Hamano | 27a128b | 2009-08-13 01:23:00 | [diff] [blame] | 2094 | In interactive commands, allow the user to provide one-letter |
| Junio C Hamano | e5bf6c1 | 2009-02-07 21:43:10 | [diff] [blame] | 2095 | input with a single key (i.e., without hitting enter). |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 2096 | Currently this is used by the `--patch` mode of |
| Junio C Hamano | 3d050d6 | 2011-05-17 06:43:34 | [diff] [blame] | 2097 | linkgit:git-add[1], linkgit:git-checkout[1], linkgit:git-commit[1], |
| 2098 | linkgit:git-reset[1], and linkgit:git-stash[1]. Note that this |
| 2099 | setting is silently ignored if portable keystroke input |
| Junio C Hamano | 81703b2 | 2014-03-14 22:00:27 | [diff] [blame] | 2100 | is not available; requires the Perl module Term::ReadKey. |
| Junio C Hamano | e5bf6c1 | 2009-02-07 21:43:10 | [diff] [blame] | 2101 | |
| Junio C Hamano | 4ba4a78 | 2016-04-03 19:11:32 | [diff] [blame] | 2102 | interactive.diffFilter:: |
| 2103 | When an interactive command (such as `git add --patch`) shows |
| 2104 | a colorized diff, git will pipe the diff through the shell |
| 2105 | command defined by this configuration variable. The command may |
| 2106 | mark up the diff further for human consumption, provided that it |
| 2107 | retains a one-to-one correspondence with the lines in the |
| 2108 | original diff. Defaults to disabled (no filtering). |
| 2109 | |
| Junio C Hamano | f93530e | 2011-05-25 23:59:59 | [diff] [blame] | 2110 | log.abbrevCommit:: |
| 2111 | If true, makes linkgit:git-log[1], linkgit:git-show[1], and |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 2112 | linkgit:git-whatchanged[1] assume `--abbrev-commit`. You may |
| 2113 | override this option with `--no-abbrev-commit`. |
| Junio C Hamano | f93530e | 2011-05-25 23:59:59 | [diff] [blame] | 2114 | |
| Junio C Hamano | b713ff1 | 2008-05-24 01:12:30 | [diff] [blame] | 2115 | log.date:: |
| Junio C Hamano | 2db3e75 | 2010-09-03 21:33:06 | [diff] [blame] | 2116 | Set the default date-time mode for the 'log' command. |
| 2117 | Setting a value for log.date is similar to using 'git log''s |
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 2118 | `--date` option. See linkgit:git-log[1] for details. |
| Junio C Hamano | b713ff1 | 2008-05-24 01:12:30 | [diff] [blame] | 2119 | |
| Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 2120 | log.decorate:: |
| 2121 | Print out the ref names of any commits that are shown by the log |
| 2122 | command. If 'short' is specified, the ref name prefixes 'refs/heads/', |
| 2123 | 'refs/tags/' and 'refs/remotes/' will not be printed. If 'full' is |
| 2124 | specified, the full ref name (including prefix) will be printed. |
| Junio C Hamano | 37cf408 | 2016-05-30 01:22:14 | [diff] [blame] | 2125 | If 'auto' is specified, then if the output is going to a terminal, |
| 2126 | the ref names are shown as if 'short' were given, otherwise no ref |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 2127 | names are shown. This is the same as the `--decorate` option |
| Junio C Hamano | 37cf408 | 2016-05-30 01:22:14 | [diff] [blame] | 2128 | of the `git log`. |
| Junio C Hamano | cb39aea | 2010-05-09 07:24:48 | [diff] [blame] | 2129 | |
| Junio C Hamano | b0a1e83 | 2015-10-15 23:08:31 | [diff] [blame] | 2130 | log.follow:: |
| 2131 | If `true`, `git log` will act as if the `--follow` option was used when |
| 2132 | a single <path> is given. This has the same limitations as `--follow`, |
| 2133 | i.e. it cannot be used to follow multiple files and does not work well |
| 2134 | on non-linear history. |
| 2135 | |
| Junio C Hamano | b86c803 | 2017-02-02 21:50:19 | [diff] [blame] | 2136 | log.graphColors:: |
| 2137 | A list of colors, separated by commas, that can be used to draw |
| 2138 | history lines in `git log --graph`. |
| 2139 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2140 | log.showRoot:: |
| Junio C Hamano | fe9acab | 2006-11-24 12:10:55 | [diff] [blame] | 2141 | If true, the initial commit will be shown as a big creation event. |
| 2142 | This is equivalent to a diff against an empty tree. |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2143 | Tools like linkgit:git-log[1] or linkgit:git-whatchanged[1], which |
| Junio C Hamano | fe9acab | 2006-11-24 12:10:55 | [diff] [blame] | 2144 | normally hide the root commit will now show it. True by default. |
| 2145 | |
| Junio C Hamano | ce836cc | 2013-01-21 02:01:53 | [diff] [blame] | 2146 | log.mailmap:: |
| 2147 | If true, makes linkgit:git-log[1], linkgit:git-show[1], and |
| 2148 | linkgit:git-whatchanged[1] assume `--use-mailmap`. |
| 2149 | |
| Junio C Hamano | 7f1bc9d | 2015-03-05 22:38:26 | [diff] [blame] | 2150 | mailinfo.scissors:: |
| 2151 | If true, makes linkgit:git-mailinfo[1] (and therefore |
| 2152 | linkgit:git-am[1]) act by default as if the --scissors option |
| 2153 | was provided on the command-line. When active, this features |
| 2154 | removes everything from the message body before a scissors |
| 2155 | line (i.e. consisting mainly of ">8", "8<" and "-"). |
| 2156 | |
| Junio C Hamano | 8bc410e | 2009-02-15 10:38:19 | [diff] [blame] | 2157 | mailmap.file:: |
| 2158 | The location of an augmenting mailmap file. The default |
| 2159 | mailmap, located in the root of the repository, is loaded |
| 2160 | first, then the mailmap file pointed to by this variable. |
| 2161 | The location of the mailmap file may be in a repository |
| 2162 | subdirectory, or somewhere outside of the repository itself. |
| 2163 | See linkgit:git-shortlog[1] and linkgit:git-blame[1]. |
| 2164 | |
| Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 2165 | mailmap.blob:: |
| 2166 | Like `mailmap.file`, but consider the value as a reference to a |
| 2167 | blob in the repository. If both `mailmap.file` and |
| 2168 | `mailmap.blob` are given, both are parsed, with entries from |
| 2169 | `mailmap.file` taking precedence. In a bare repository, this |
| 2170 | defaults to `HEAD:.mailmap`. In a non-bare repository, it |
| 2171 | defaults to empty. |
| 2172 | |
| Junio C Hamano | 8b588d5 | 2008-03-15 09:48:37 | [diff] [blame] | 2173 | man.viewer:: |
| 2174 | Specify the programs that may be used to display help in the |
| 2175 | 'man' format. See linkgit:git-help[1]. |
| 2176 | |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 2177 | man.<tool>.cmd:: |
| 2178 | Specify the command to invoke the specified man viewer. The |
| 2179 | specified command is evaluated in shell with the man page |
| 2180 | passed as argument. (See linkgit:git-help[1].) |
| Junio C Hamano | 103ad7f | 2007-03-14 11:19:26 | [diff] [blame] | 2181 | |
| Junio C Hamano | 6d76d61 | 2008-05-09 05:46:08 | [diff] [blame] | 2182 | man.<tool>.path:: |
| 2183 | Override the path for the given tool that may be used to |
| 2184 | display help in the 'man' format. See linkgit:git-help[1]. |
| Junio C Hamano | e90436a | 2007-04-22 07:22:13 | [diff] [blame] | 2185 | |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2186 | include::merge-config.txt[] |
| Junio C Hamano | a476efa | 2008-10-10 15:31:42 | [diff] [blame] | 2187 | |
| Junio C Hamano | 1fbbbc1 | 2007-12-18 07:01:27 | [diff] [blame] | 2188 | mergetool.<tool>.path:: |
| 2189 | Override the path for the given tool. This is useful in case |
| 2190 | your tool is not in the PATH. |
| 2191 | |
| Junio C Hamano | 86bcccc | 2008-03-08 09:33:55 | [diff] [blame] | 2192 | mergetool.<tool>.cmd:: |
| 2193 | Specify the command to invoke the specified merge tool. The |
| 2194 | specified command is evaluated in shell with the following |
| 2195 | variables available: 'BASE' is the name of a temporary file |
| 2196 | containing the common base of the files to be merged, if available; |
| 2197 | 'LOCAL' is the name of a temporary file containing the contents of |
| 2198 | the file on the current branch; 'REMOTE' is the name of a temporary |
| 2199 | file containing the contents of the file from the branch being |
| 2200 | merged; 'MERGED' contains the name of the file to which the merge |
| 2201 | tool should write the results of a successful merge. |
| 2202 | |
| 2203 | mergetool.<tool>.trustExitCode:: |
| 2204 | For a custom merge command, specify whether the exit code of |
| 2205 | the merge command can be used to determine whether the merge was |
| 2206 | successful. If this is not set to true then the merge target file |
| 2207 | timestamp is checked and the merge assumed to have been successful |
| 2208 | if the file has been updated, otherwise the user is prompted to |
| 2209 | indicate the success of the merge. |
| 2210 | |
| Junio C Hamano | e478e40 | 2014-10-21 22:14:45 | [diff] [blame] | 2211 | mergetool.meld.hasOutput:: |
| 2212 | Older versions of `meld` do not support the `--output` option. |
| 2213 | Git will attempt to detect whether `meld` supports `--output` |
| 2214 | by inspecting the output of `meld --help`. Configuring |
| 2215 | `mergetool.meld.hasOutput` will make Git skip these checks and |
| 2216 | use the configured value instead. Setting `mergetool.meld.hasOutput` |
| 2217 | to `true` tells Git to unconditionally use the `--output` option, |
| 2218 | and `false` avoids using `--output`. |
| 2219 | |
| Junio C Hamano | 86bcccc | 2008-03-08 09:33:55 | [diff] [blame] | 2220 | mergetool.keepBackup:: |
| 2221 | After performing a merge, the original file with conflict markers |
| 2222 | can be saved as a file with a `.orig` extension. If this variable |
| 2223 | is set to `false` then this file is not preserved. Defaults to |
| 2224 | `true` (i.e. keep the backup files). |
| 2225 | |
| Junio C Hamano | 10b7a34 | 2009-01-01 22:05:17 | [diff] [blame] | 2226 | mergetool.keepTemporaries:: |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2227 | When invoking a custom merge tool, Git uses a set of temporary |
| Junio C Hamano | 10b7a34 | 2009-01-01 22:05:17 | [diff] [blame] | 2228 | files to pass to the tool. If the tool returns an error and this |
| 2229 | variable is set to `true`, then these temporary files will be |
| 2230 | preserved, otherwise they will be removed after the tool has |
| 2231 | exited. Defaults to `false`. |
| 2232 | |
| Junio C Hamano | e478e40 | 2014-10-21 22:14:45 | [diff] [blame] | 2233 | mergetool.writeToTemp:: |
| 2234 | Git writes temporary 'BASE', 'LOCAL', and 'REMOTE' versions of |
| 2235 | conflicting files in the worktree by default. Git will attempt |
| 2236 | to use a temporary directory for these files when set `true`. |
| 2237 | Defaults to `false`. |
| 2238 | |
| Junio C Hamano | 10b7a34 | 2009-01-01 22:05:17 | [diff] [blame] | 2239 | mergetool.prompt:: |
| 2240 | Prompt before each invocation of the merge resolution program. |
| 2241 | |
| Junio C Hamano | 3891e25 | 2015-08-31 23:06:13 | [diff] [blame] | 2242 | notes.mergeStrategy:: |
| 2243 | Which merge strategy to choose by default when resolving notes |
| 2244 | conflicts. Must be one of `manual`, `ours`, `theirs`, `union`, or |
| 2245 | `cat_sort_uniq`. Defaults to `manual`. See "NOTES MERGE STRATEGIES" |
| 2246 | section of linkgit:git-notes[1] for more information on each strategy. |
| 2247 | |
| 2248 | notes.<name>.mergeStrategy:: |
| 2249 | Which merge strategy to choose when doing a notes merge into |
| 2250 | refs/notes/<name>. This overrides the more general |
| 2251 | "notes.mergeStrategy". See the "NOTES MERGE STRATEGIES" section in |
| 2252 | linkgit:git-notes[1] for more information on the available strategies. |
| 2253 | |
| Junio C Hamano | 3166736 | 2010-03-25 00:38:53 | [diff] [blame] | 2254 | notes.displayRef:: |
| 2255 | The (fully qualified) refname from which to show notes when |
| 2256 | showing commit messages. The value of this variable can be set |
| 2257 | to a glob, in which case notes from all matching refs will be |
| 2258 | shown. You may also specify this configuration variable |
| 2259 | several times. A warning will be issued for refs that do not |
| 2260 | exist, but a glob that does not match any refs is silently |
| 2261 | ignored. |
| 2262 | + |
| 2263 | This setting can be overridden with the `GIT_NOTES_DISPLAY_REF` |
| 2264 | environment variable, which must be a colon separated list of refs or |
| 2265 | globs. |
| 2266 | + |
| 2267 | The effective value of "core.notesRef" (possibly overridden by |
| 2268 | GIT_NOTES_REF) is also implicitly added to the list of refs to be |
| 2269 | displayed. |
| 2270 | |
| 2271 | notes.rewrite.<command>:: |
| 2272 | When rewriting commits with <command> (currently `amend` or |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2273 | `rebase`) and this variable is set to `true`, Git |
| Junio C Hamano | 3166736 | 2010-03-25 00:38:53 | [diff] [blame] | 2274 | automatically copies your notes from the original to the |
| 2275 | rewritten commit. Defaults to `true`, but see |
| 2276 | "notes.rewriteRef" below. |
| Junio C Hamano | 3166736 | 2010-03-25 00:38:53 | [diff] [blame] | 2277 | |
| 2278 | notes.rewriteMode:: |
| 2279 | When copying notes during a rewrite (see the |
| 2280 | "notes.rewrite.<command>" option), determines what to do if |
| 2281 | the target commit already has a note. Must be one of |
| Junio C Hamano | 3891e25 | 2015-08-31 23:06:13 | [diff] [blame] | 2282 | `overwrite`, `concatenate`, `cat_sort_uniq`, or `ignore`. |
| 2283 | Defaults to `concatenate`. |
| Junio C Hamano | 3166736 | 2010-03-25 00:38:53 | [diff] [blame] | 2284 | + |
| 2285 | This setting can be overridden with the `GIT_NOTES_REWRITE_MODE` |
| 2286 | environment variable. |
| 2287 | |
| 2288 | notes.rewriteRef:: |
| 2289 | When copying notes during a rewrite, specifies the (fully |
| 2290 | qualified) ref whose notes should be copied. The ref may be a |
| 2291 | glob, in which case notes in all matching refs will be copied. |
| 2292 | You may also specify this configuration several times. |
| 2293 | + |
| 2294 | Does not have a default value; you must configure this variable to |
| Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 2295 | enable note rewriting. Set it to `refs/notes/commits` to enable |
| 2296 | rewriting for the default commit notes. |
| Junio C Hamano | 2b3ee5d | 2010-05-08 05:41:18 | [diff] [blame] | 2297 | + |
| 2298 | This setting can be overridden with the `GIT_NOTES_REWRITE_REF` |
| 2299 | environment variable, which must be a colon separated list of refs or |
| 2300 | globs. |
| Junio C Hamano | 3166736 | 2010-03-25 00:38:53 | [diff] [blame] | 2301 | |
| Junio C Hamano | 75cc4c9 | 2006-07-24 08:25:03 | [diff] [blame] | 2302 | pack.window:: |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2303 | 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] | 2304 | window size is given on the command line. Defaults to 10. |
| 2305 | |
| Junio C Hamano | 91d44c5 | 2007-05-09 07:16:07 | [diff] [blame] | 2306 | pack.depth:: |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2307 | 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] | 2308 | maximum depth is given on the command line. Defaults to 50. |
| 2309 | |
| Junio C Hamano | 235d53f | 2007-07-13 00:25:15 | [diff] [blame] | 2310 | pack.windowMemory:: |
| Junio C Hamano | 2a4bcbc | 2014-10-29 20:07:39 | [diff] [blame] | 2311 | The maximum size of memory that is consumed by each thread |
| 2312 | in linkgit:git-pack-objects[1] for pack window memory when |
| 2313 | no limit is given on the command line. The value can be |
| 2314 | suffixed with "k", "m", or "g". When left unconfigured (or |
| 2315 | set explicitly to 0), there will be no limit. |
| Junio C Hamano | 235d53f | 2007-07-13 00:25:15 | [diff] [blame] | 2316 | |
| Junio C Hamano | f2ce297 | 2007-05-20 19:12:09 | [diff] [blame] | 2317 | pack.compression:: |
| 2318 | An integer -1..9, indicating the compression level for objects |
| 2319 | in a pack file. -1 is the zlib default. 0 means no |
| 2320 | compression, and 1..9 are various speed/size tradeoffs, 9 being |
| 2321 | slowest. If not set, defaults to core.compression. If that is |
| Junio C Hamano | 2e72a94 | 2007-11-21 08:54:42 | [diff] [blame] | 2322 | not set, defaults to -1, the zlib default, which is "a default |
| 2323 | compromise between speed and compression (currently equivalent |
| 2324 | to level 6)." |
| Junio C Hamano | 657fd8a | 2010-10-07 00:01:24 | [diff] [blame] | 2325 | + |
| 2326 | Note that changing the compression level will not automatically recompress |
| 2327 | all existing objects. You can force recompression by passing the -F option |
| 2328 | to linkgit:git-repack[1]. |
| Junio C Hamano | f2ce297 | 2007-05-20 19:12:09 | [diff] [blame] | 2329 | |
| Junio C Hamano | 679d22d | 2007-06-02 21:13:44 | [diff] [blame] | 2330 | pack.deltaCacheSize:: |
| Junio C Hamano | a638742 | 2007-08-25 03:54:27 | [diff] [blame] | 2331 | The maximum memory in bytes used for caching deltas in |
| Junio C Hamano | 9f88386 | 2009-08-11 06:23:52 | [diff] [blame] | 2332 | linkgit:git-pack-objects[1] before writing them out to a pack. |
| 2333 | This cache is used to speed up the writing object phase by not |
| 2334 | having to recompute the final delta result once the best match |
| 2335 | for all objects is found. Repacking large repositories on machines |
| 2336 | which are tight with memory might be badly impacted by this though, |
| 2337 | especially if this cache pushes the system into swapping. |
| 2338 | A value of 0 means no limit. The smallest size of 1 byte may be |
| 2339 | used to virtually disable this cache. Defaults to 256 MiB. |
| Junio C Hamano | 679d22d | 2007-06-02 21:13:44 | [diff] [blame] | 2340 | |
| 2341 | pack.deltaCacheLimit:: |
| Junio C Hamano | 58155b4 | 2007-09-15 07:46:14 | [diff] [blame] | 2342 | The maximum size of a delta, that is cached in |
| Junio C Hamano | 9f88386 | 2009-08-11 06:23:52 | [diff] [blame] | 2343 | linkgit:git-pack-objects[1]. This cache is used to speed up the |
| 2344 | writing object phase by not having to recompute the final delta |
| 2345 | 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] | 2346 | |
| Junio C Hamano | 58155b4 | 2007-09-15 07:46:14 | [diff] [blame] | 2347 | pack.threads:: |
| 2348 | Specifies the number of threads to spawn when searching for best |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2349 | delta matches. This requires that linkgit:git-pack-objects[1] |
| Junio C Hamano | 58155b4 | 2007-09-15 07:46:14 | [diff] [blame] | 2350 | be compiled with pthreads otherwise this option is ignored with a |
| 2351 | warning. This is meant to reduce packing time on multiprocessor |
| 2352 | machines. The required amount of memory for the delta search window |
| 2353 | is however multiplied by the number of threads. |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2354 | Specifying 0 will cause Git to auto-detect the number of CPU's |
| Junio C Hamano | 24bc09a | 2008-02-28 00:27:44 | [diff] [blame] | 2355 | and set the number of threads accordingly. |
| Junio C Hamano | 58155b4 | 2007-09-15 07:46:14 | [diff] [blame] | 2356 | |
| Junio C Hamano | d814b6d | 2007-11-04 11:13:49 | [diff] [blame] | 2357 | pack.indexVersion:: |
| 2358 | Specify the default pack index version. Valid values are 1 for |
| 2359 | legacy pack index used by Git versions prior to 1.5.2, and 2 for |
| 2360 | the new pack index with capabilities for packs larger than 4 GB |
| 2361 | as well as proper protection against the repacking of corrupted |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 2362 | packs. Version 2 is the default. Note that version 2 is enforced |
| 2363 | and this config option ignored whenever the corresponding pack is |
| 2364 | larger than 2 GB. |
| 2365 | + |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2366 | If you have an old Git that does not understand the version 2 `*.idx` file, |
| Junio C Hamano | f85ef63 | 2016-02-17 22:31:06 | [diff] [blame] | 2367 | cloning or fetching over a non native protocol (e.g. "http") |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 2368 | that will copy both `*.pack` file and corresponding `*.idx` file from the |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 2369 | other side may give you a repository that cannot be accessed with your |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2370 | older version of Git. If the `*.pack` file is smaller than 2 GB, however, |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 2371 | you can use linkgit:git-index-pack[1] on the *.pack file to regenerate |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 2372 | the `*.idx` file. |
| Junio C Hamano | d814b6d | 2007-11-04 11:13:49 | [diff] [blame] | 2373 | |
| Junio C Hamano | 09a926d | 2008-03-13 07:55:29 | [diff] [blame] | 2374 | pack.packSizeLimit:: |
| Junio C Hamano | 4d97958 | 2010-02-04 06:27:29 | [diff] [blame] | 2375 | The maximum size of a pack. This setting only affects |
| 2376 | packing to a file when repacking, i.e. the git:// protocol |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 2377 | is unaffected. It can be overridden by the `--max-pack-size` |
| Junio C Hamano | 74fd0fc | 2016-05-10 21:23:56 | [diff] [blame] | 2378 | option of linkgit:git-repack[1]. Reaching this limit results |
| 2379 | in the creation of multiple packfiles; which in turn prevents |
| 2380 | bitmaps from being created. |
| 2381 | The minimum size allowed is limited to 1 MiB. |
| 2382 | The default is unlimited. |
| Junio C Hamano | 4d97958 | 2010-02-04 06:27:29 | [diff] [blame] | 2383 | Common unit suffixes of 'k', 'm', or 'g' are |
| 2384 | supported. |
| Junio C Hamano | 49dccaf | 2008-02-10 10:48:01 | [diff] [blame] | 2385 | |
| Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 2386 | pack.useBitmaps:: |
| 2387 | When true, git will use pack bitmaps (if available) when packing |
| 2388 | to stdout (e.g., during the server side of a fetch). Defaults to |
| 2389 | true. You should not generally need to turn this off unless |
| 2390 | you are debugging pack bitmaps. |
| 2391 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2392 | pack.writeBitmaps (deprecated):: |
| Junio C Hamano | 38d0253 | 2014-06-26 21:48:50 | [diff] [blame] | 2393 | This is a deprecated synonym for `repack.writeBitmaps`. |
| Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 2394 | |
| 2395 | pack.writeBitmapHashCache:: |
| 2396 | When true, git will include a "hash cache" section in the bitmap |
| 2397 | index (if one is written). This cache can be used to feed git's |
| 2398 | delta heuristics, potentially leading to better deltas between |
| 2399 | bitmapped and non-bitmapped objects (e.g., when serving a fetch |
| 2400 | between an older, bitmapped pack and objects that have been |
| 2401 | pushed since the last gc). The downside is that it consumes 4 |
| 2402 | bytes per object of disk space, and that JGit's bitmap |
| 2403 | implementation does not understand it, causing it to complain if |
| 2404 | Git and JGit are used on the same repository. Defaults to false. |
| 2405 | |
| Junio C Hamano | 9e96a1a | 2008-08-16 10:23:18 | [diff] [blame] | 2406 | pager.<cmd>:: |
| Junio C Hamano | 788eeba | 2010-12-08 22:50:43 | [diff] [blame] | 2407 | If the value is boolean, turns on or off pagination of the |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2408 | output of a particular Git subcommand when writing to a tty. |
| Junio C Hamano | 788eeba | 2010-12-08 22:50:43 | [diff] [blame] | 2409 | Otherwise, turns on pagination for the subcommand using the |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 2410 | pager specified by the value of `pager.<cmd>`. If `--paginate` |
| 2411 | or `--no-pager` is specified on the command line, it takes |
| Junio C Hamano | 788eeba | 2010-12-08 22:50:43 | [diff] [blame] | 2412 | precedence over this option. To disable pagination for all |
| 2413 | commands, set `core.pager` or `GIT_PAGER` to `cat`. |
| Junio C Hamano | 9e96a1a | 2008-08-16 10:23:18 | [diff] [blame] | 2414 | |
| Junio C Hamano | a574a09 | 2010-06-13 19:57:10 | [diff] [blame] | 2415 | pretty.<name>:: |
| 2416 | Alias for a --pretty= format string, as specified in |
| 2417 | linkgit:git-log[1]. Any aliases defined here can be used just |
| 2418 | as the built-in pretty formats could. For example, |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 2419 | running `git config pretty.changelog "format:* %H %s"` |
| Junio C Hamano | a574a09 | 2010-06-13 19:57:10 | [diff] [blame] | 2420 | would cause the invocation `git log --pretty=changelog` |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 2421 | to be equivalent to running `git log "--pretty=format:* %H %s"`. |
| Junio C Hamano | a574a09 | 2010-06-13 19:57:10 | [diff] [blame] | 2422 | Note that an alias with the same name as a built-in format |
| 2423 | will be silently ignored. |
| 2424 | |
| Junio C Hamano | 9e35abf | 2016-12-27 22:37:27 | [diff] [blame] | 2425 | protocol.allow:: |
| 2426 | If set, provide a user defined default policy for all protocols which |
| 2427 | don't explicitly have a policy (`protocol.<name>.allow`). By default, |
| 2428 | if unset, known-safe protocols (http, https, git, ssh, file) have a |
| 2429 | default policy of `always`, known-dangerous protocols (ext) have a |
| 2430 | default policy of `never`, and all other protocols have a default |
| 2431 | policy of `user`. Supported policies: |
| 2432 | + |
| 2433 | -- |
| 2434 | |
| 2435 | * `always` - protocol is always able to be used. |
| 2436 | |
| 2437 | * `never` - protocol is never able to be used. |
| 2438 | |
| 2439 | * `user` - protocol is only able to be used when `GIT_PROTOCOL_FROM_USER` is |
| 2440 | either unset or has a value of 1. This policy should be used when you want a |
| 2441 | protocol to be directly usable by the user but don't want it used by commands which |
| 2442 | execute clone/fetch/push commands without user input, e.g. recursive |
| 2443 | submodule initialization. |
| 2444 | |
| 2445 | -- |
| 2446 | |
| 2447 | protocol.<name>.allow:: |
| 2448 | Set a policy to be used by protocol `<name>` with clone/fetch/push |
| 2449 | commands. See `protocol.allow` above for the available policies. |
| 2450 | + |
| 2451 | The protocol names currently used by git are: |
| 2452 | + |
| 2453 | -- |
| 2454 | - `file`: any local file-based path (including `file://` URLs, |
| 2455 | or local paths) |
| 2456 | |
| 2457 | - `git`: the anonymous git protocol over a direct TCP |
| 2458 | connection (or proxy, if configured) |
| 2459 | |
| 2460 | - `ssh`: git over ssh (including `host:path` syntax, |
| 2461 | `ssh://`, etc). |
| 2462 | |
| 2463 | - `http`: git over http, both "smart http" and "dumb http". |
| 2464 | Note that this does _not_ include `https`; if you want to configure |
| 2465 | both, you must do so individually. |
| 2466 | |
| 2467 | - any external helpers are named by their protocol (e.g., use |
| 2468 | `hg` to allow the `git-remote-hg` helper) |
| 2469 | -- |
| 2470 | |
| Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 2471 | pull.ff:: |
| 2472 | By default, Git does not create an extra merge commit when merging |
| 2473 | a commit that is a descendant of the current commit. Instead, the |
| 2474 | tip of the current branch is fast-forwarded. When set to `false`, |
| 2475 | this variable tells Git to create an extra merge commit in such |
| 2476 | a case (equivalent to giving the `--no-ff` option from the command |
| 2477 | line). When set to `only`, only such fast-forward merges are |
| 2478 | allowed (equivalent to giving the `--ff-only` option from the |
| Junio C Hamano | c4e2a20 | 2015-05-26 21:38:47 | [diff] [blame] | 2479 | command line). This setting overrides `merge.ff` when pulling. |
| Junio C Hamano | 5b3533d | 2014-02-27 23:07:15 | [diff] [blame] | 2480 | |
| Junio C Hamano | 515ab1d | 2011-12-09 23:41:20 | [diff] [blame] | 2481 | pull.rebase:: |
| 2482 | When true, rebase branches on top of the fetched branch, instead |
| 2483 | of merging the default branch from the default remote when "git |
| 2484 | pull" is run. See "branch.<name>.rebase" for setting this on a |
| 2485 | per-branch basis. |
| 2486 | + |
| Junio C Hamano | 7db630e | 2015-09-17 20:26:22 | [diff] [blame] | 2487 | When preserve, also pass `--preserve-merges` along to 'git rebase' |
| 2488 | so that locally committed merge commits will not be flattened |
| 2489 | by running 'git pull'. |
| Junio C Hamano | cf4a174 | 2013-09-11 22:57:50 | [diff] [blame] | 2490 | + |
| Junio C Hamano | 289d7e8 | 2016-01-27 00:20:38 | [diff] [blame] | 2491 | When the value is `interactive`, the rebase is run in interactive mode. |
| 2492 | + |
| Junio C Hamano | 515ab1d | 2011-12-09 23:41:20 | [diff] [blame] | 2493 | *NOTE*: this is a possibly dangerous operation; do *not* use |
| 2494 | it unless you understand the implications (see linkgit:git-rebase[1] |
| 2495 | for details). |
| 2496 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 2497 | pull.octopus:: |
| 2498 | The default merge strategy to use when pulling multiple branches |
| 2499 | at once. |
| 2500 | |
| 2501 | pull.twohead:: |
| 2502 | The default merge strategy to use when pulling a single branch. |
| 2503 | |
| Junio C Hamano | 1de7572 | 2009-03-26 08:39:38 | [diff] [blame] | 2504 | push.default:: |
| Junio C Hamano | 5865559 | 2013-07-11 20:52:33 | [diff] [blame] | 2505 | Defines the action `git push` should take if no refspec is |
| 2506 | explicitly given. Different values are well-suited for |
| 2507 | specific workflows; for instance, in a purely central workflow |
| 2508 | (i.e. the fetch source is equal to the push destination), |
| 2509 | `upstream` is probably what you want. Possible values are: |
| Junio C Hamano | 1de7572 | 2009-03-26 08:39:38 | [diff] [blame] | 2510 | + |
| Junio C Hamano | bcaa8bc | 2012-07-03 22:17:20 | [diff] [blame] | 2511 | -- |
| Junio C Hamano | 5865559 | 2013-07-11 20:52:33 | [diff] [blame] | 2512 | |
| 2513 | * `nothing` - do not push anything (error out) unless a refspec is |
| 2514 | explicitly given. This is primarily meant for people who want to |
| 2515 | avoid mistakes by always being explicit. |
| 2516 | |
| 2517 | * `current` - push the current branch to update a branch with the same |
| 2518 | name on the receiving end. Works in both central and non-central |
| 2519 | workflows. |
| 2520 | |
| 2521 | * `upstream` - push the current branch back to the branch whose |
| 2522 | changes are usually integrated into the current branch (which is |
| 2523 | called `@{upstream}`). This mode only makes sense if you are |
| 2524 | pushing to the same repository you would normally pull from |
| 2525 | (i.e. central workflow). |
| 2526 | |
| Junio C Hamano | cb06ef9 | 2017-03-21 22:40:14 | [diff] [blame] | 2527 | * `tracking` - This is a deprecated synonym for `upstream`. |
| 2528 | |
| Junio C Hamano | 5865559 | 2013-07-11 20:52:33 | [diff] [blame] | 2529 | * `simple` - in centralized workflow, work like `upstream` with an |
| 2530 | added safety to refuse to push if the upstream branch's name is |
| 2531 | different from the local one. |
| Junio C Hamano | bcaa8bc | 2012-07-03 22:17:20 | [diff] [blame] | 2532 | + |
| Junio C Hamano | 5865559 | 2013-07-11 20:52:33 | [diff] [blame] | 2533 | When pushing to a remote that is different from the remote you normally |
| 2534 | pull from, work as `current`. This is the safest option and is suited |
| 2535 | for beginners. |
| 2536 | + |
| Junio C Hamano | 1d669b8 | 2014-03-11 21:36:00 | [diff] [blame] | 2537 | This mode has become the default in Git 2.0. |
| Junio C Hamano | 5865559 | 2013-07-11 20:52:33 | [diff] [blame] | 2538 | |
| 2539 | * `matching` - push all branches having the same name on both ends. |
| 2540 | This makes the repository you are pushing to remember the set of |
| 2541 | branches that will be pushed out (e.g. if you always push 'maint' |
| 2542 | and 'master' there and no other branches, the repository you push |
| 2543 | to will have these two branches, and your local 'maint' and |
| 2544 | 'master' will be pushed there). |
| 2545 | + |
| 2546 | To use this mode effectively, you have to make sure _all_ the |
| 2547 | branches you would push out are ready to be pushed out before |
| 2548 | running 'git push', as the whole point of this mode is to allow you |
| 2549 | to push all of the branches in one go. If you usually finish work |
| 2550 | on only one branch and push out the result, while other branches are |
| 2551 | unfinished, this mode is not for you. Also this mode is not |
| 2552 | suitable for pushing into a shared central repository, as other |
| 2553 | people may add new branches there, or update the tip of existing |
| 2554 | branches outside your control. |
| 2555 | + |
| Junio C Hamano | 1d669b8 | 2014-03-11 21:36:00 | [diff] [blame] | 2556 | This used to be the default, but not since Git 2.0 (`simple` is the |
| 2557 | new default). |
| Junio C Hamano | 5865559 | 2013-07-11 20:52:33 | [diff] [blame] | 2558 | |
| 2559 | -- |
| Junio C Hamano | 1de7572 | 2009-03-26 08:39:38 | [diff] [blame] | 2560 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2561 | push.followTags:: |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 2562 | If set to true enable `--follow-tags` option by default. You |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2563 | may override this configuration at time of push by specifying |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 2564 | `--no-follow-tags`. |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2565 | |
| Junio C Hamano | 3891e25 | 2015-08-31 23:06:13 | [diff] [blame] | 2566 | push.gpgSign:: |
| 2567 | May be set to a boolean value, or the string 'if-asked'. A true |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 2568 | value causes all pushes to be GPG signed, as if `--signed` is |
| Junio C Hamano | 3891e25 | 2015-08-31 23:06:13 | [diff] [blame] | 2569 | passed to linkgit:git-push[1]. The string 'if-asked' causes |
| 2570 | pushes to be signed if the server supports it, as if |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 2571 | `--signed=if-asked` is passed to 'git push'. A false value may |
| Junio C Hamano | 3891e25 | 2015-08-31 23:06:13 | [diff] [blame] | 2572 | override a value from a lower-priority config file. An explicit |
| 2573 | command-line flag always overrides this config option. |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2574 | |
| Junio C Hamano | 409a33a | 2015-12-22 23:45:23 | [diff] [blame] | 2575 | push.recurseSubmodules:: |
| 2576 | Make sure all submodule commits used by the revisions to be pushed |
| 2577 | are available on a remote-tracking branch. If the value is 'check' |
| 2578 | then Git will verify that all submodule commits that changed in the |
| 2579 | revisions to be pushed are available on at least one remote of the |
| 2580 | submodule. If any commits are missing, the push will be aborted and |
| 2581 | exit with non-zero status. If the value is 'on-demand' then all |
| 2582 | submodules that changed in the revisions to be pushed will be |
| 2583 | pushed. If on-demand was not able to push all necessary revisions |
| 2584 | it will also be aborted and exit with non-zero status. If the value |
| 2585 | is 'no' then default behavior of ignoring submodules when pushing |
| 2586 | is retained. You may override this configuration at time of push by |
| 2587 | specifying '--recurse-submodules=check|on-demand|no'. |
| 2588 | |
| Junio C Hamano | ea6a764 | 2009-03-11 23:56:19 | [diff] [blame] | 2589 | rebase.stat:: |
| 2590 | Whether to show a diffstat of what changed upstream since the last |
| 2591 | rebase. False by default. |
| 2592 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2593 | rebase.autoSquash:: |
| Junio C Hamano | 92d8037 | 2016-07-13 22:00:05 | [diff] [blame] | 2594 | If set to true enable `--autosquash` option by default. |
| Junio C Hamano | 075ae87 | 2010-09-01 18:43:07 | [diff] [blame] | 2595 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2596 | rebase.autoStash:: |
| Junio C Hamano | f1f5a7b | 2013-06-11 22:23:52 | [diff] [blame] | 2597 | When set to true, automatically create a temporary stash |
| 2598 | before the operation begins, and apply it after the operation |
| 2599 | ends. This means that you can run rebase on a dirty worktree. |
| 2600 | However, use with care: the final stash application after a |
| 2601 | successful rebase might result in non-trivial conflicts. |
| 2602 | Defaults to false. |
| 2603 | |
| Junio C Hamano | d7ed404 | 2015-08-03 19:43:00 | [diff] [blame] | 2604 | rebase.missingCommitsCheck:: |
| 2605 | If set to "warn", git rebase -i will print a warning if some |
| 2606 | commits are removed (e.g. a line was deleted), however the |
| 2607 | rebase will still proceed. If set to "error", it will print |
| 2608 | the previous warning and stop the rebase, 'git rebase |
| 2609 | --edit-todo' can then be used to correct the error. If set to |
| 2610 | "ignore", no checking is done. |
| 2611 | To drop a commit without warning or error, use the `drop` |
| 2612 | command in the todo-list. |
| 2613 | Defaults to "ignore". |
| 2614 | |
| Junio C Hamano | f2f28b1 | 2016-10-31 21:41:58 | [diff] [blame] | 2615 | rebase.instructionFormat:: |
| Junio C Hamano | d7ed404 | 2015-08-03 19:43:00 | [diff] [blame] | 2616 | A format string, as specified in linkgit:git-log[1], to be used for |
| 2617 | the instruction list during an interactive rebase. The format will automatically |
| 2618 | have the long commit hash prepended to the format. |
| 2619 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2620 | receive.advertiseAtomic:: |
| Junio C Hamano | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 2621 | By default, git-receive-pack will advertise the atomic push |
| Junio C Hamano | e48a113 | 2016-08-03 22:40:21 | [diff] [blame] | 2622 | capability to its clients. If you don't want to advertise this |
| 2623 | capability, set this variable to false. |
| 2624 | |
| 2625 | receive.advertisePushOptions:: |
| Junio C Hamano | d3ab1ad | 2017-05-23 06:52:18 | [diff] [blame^] | 2626 | When set to true, git-receive-pack will advertise the push options |
| 2627 | capability to its clients. False by default. |
| Junio C Hamano | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 2628 | |
| Junio C Hamano | 621e123 | 2009-10-26 05:16:47 | [diff] [blame] | 2629 | receive.autogc:: |
| 2630 | By default, git-receive-pack will run "git-gc --auto" after |
| 2631 | receiving data from git-push and updating refs. You can stop |
| 2632 | it by setting this variable to false. |
| 2633 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2634 | receive.certNonceSeed:: |
| Junio C Hamano | 9236fea | 2014-10-14 22:28:09 | [diff] [blame] | 2635 | By setting this variable to a string, `git receive-pack` |
| 2636 | will accept a `git push --signed` and verifies it by using |
| 2637 | a "nonce" protected by HMAC using this string as a secret |
| 2638 | key. |
| 2639 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2640 | receive.certNonceSlop:: |
| Junio C Hamano | 9236fea | 2014-10-14 22:28:09 | [diff] [blame] | 2641 | When a `git push --signed` sent a push certificate with a |
| 2642 | "nonce" that was issued by a receive-pack serving the same |
| 2643 | repository within this many seconds, export the "nonce" |
| 2644 | found in the certificate to `GIT_PUSH_CERT_NONCE` to the |
| 2645 | hooks (instead of what the receive-pack asked the sending |
| 2646 | side to include). This may allow writing checks in |
| 2647 | `pre-receive` and `post-receive` a bit easier. Instead of |
| 2648 | checking `GIT_PUSH_CERT_NONCE_SLOP` environment variable |
| 2649 | that records by how many seconds the nonce is stale to |
| 2650 | decide if they want to accept the certificate, they only |
| 2651 | can check `GIT_PUSH_CERT_NONCE_STATUS` is `OK`. |
| 2652 | |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2653 | receive.fsckObjects:: |
| 2654 | If it is set to true, git-receive-pack will check all received |
| 2655 | objects. It will abort in the case of a malformed object or a |
| 2656 | broken link. The result of an abort are only dangling objects. |
| Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 2657 | Defaults to false. If not set, the value of `transfer.fsckObjects` |
| 2658 | is used instead. |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2659 | |
| Junio C Hamano | d7ed404 | 2015-08-03 19:43:00 | [diff] [blame] | 2660 | receive.fsck.<msg-id>:: |
| 2661 | When `receive.fsckObjects` is set to true, errors can be switched |
| 2662 | to warnings and vice versa by configuring the `receive.fsck.<msg-id>` |
| 2663 | setting where the `<msg-id>` is the fsck message ID and the value |
| 2664 | is one of `error`, `warn` or `ignore`. For convenience, fsck prefixes |
| 2665 | the error/warning with the message ID, e.g. "missingEmail: invalid |
| 2666 | author/committer line - missing email" means that setting |
| 2667 | `receive.fsck.missingEmail = ignore` will hide that issue. |
| 2668 | + |
| 2669 | This feature is intended to support working with legacy repositories |
| 2670 | which would not pass pushing when `receive.fsckObjects = true`, allowing |
| 2671 | the host to accept repositories with certain known issues but still catch |
| 2672 | other issues. |
| 2673 | |
| 2674 | receive.fsck.skipList:: |
| 2675 | The path to a sorted list of object names (i.e. one SHA-1 per |
| 2676 | line) that are known to be broken in a non-fatal way and should |
| 2677 | be ignored. This feature is useful when an established project |
| 2678 | should be accepted despite early commits containing errors that |
| 2679 | can be safely ignored such as invalid committer email addresses. |
| 2680 | Note: corrupt objects cannot be skipped with this setting. |
| 2681 | |
| Junio C Hamano | e48a113 | 2016-08-03 22:40:21 | [diff] [blame] | 2682 | receive.keepAlive:: |
| 2683 | After receiving the pack from the client, `receive-pack` may |
| 2684 | produce no output (if `--quiet` was specified) while processing |
| 2685 | the pack, causing some networks to drop the TCP connection. |
| 2686 | With this option set, if `receive-pack` does not transmit |
| 2687 | any data in this phase for `receive.keepAlive` seconds, it will |
| 2688 | send a short keepalive packet. The default is 5 seconds; set |
| 2689 | to 0 to disable keepalives entirely. |
| 2690 | |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2691 | receive.unpackLimit:: |
| 2692 | If the number of objects received in a push is below this |
| 2693 | limit then the objects will be unpacked into loose object |
| 2694 | files. However if the number of received objects equals or |
| 2695 | exceeds this limit then the received pack will be stored as |
| 2696 | a pack, after adding any missing delta bases. Storing the |
| 2697 | pack from a push can make the push operation complete faster, |
| 2698 | especially on slow filesystems. If not set, the value of |
| 2699 | `transfer.unpackLimit` is used instead. |
| 2700 | |
| Junio C Hamano | cd45166 | 2016-09-13 00:54:09 | [diff] [blame] | 2701 | receive.maxInputSize:: |
| 2702 | If the size of the incoming pack stream is larger than this |
| 2703 | limit, then git-receive-pack will error out, instead of |
| 2704 | accepting the pack file. If not set or set to 0, then the size |
| 2705 | is unlimited. |
| 2706 | |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2707 | receive.denyDeletes:: |
| 2708 | If set to true, git-receive-pack will deny a ref update that deletes |
| 2709 | the ref. Use this to prevent such a ref deletion via a push. |
| 2710 | |
| Junio C Hamano | b4448a8 | 2010-07-26 09:02:32 | [diff] [blame] | 2711 | receive.denyDeleteCurrent:: |
| 2712 | If set to true, git-receive-pack will deny a ref update that |
| 2713 | deletes the currently checked out branch of a non-bare repository. |
| 2714 | |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2715 | receive.denyCurrentBranch:: |
| Junio C Hamano | e97d577 | 2010-05-19 08:13:58 | [diff] [blame] | 2716 | 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] | 2717 | to the currently checked out branch of a non-bare repository. |
| 2718 | Such a push is potentially dangerous because it brings the HEAD |
| 2719 | out of sync with the index and working tree. If set to "warn", |
| 2720 | print a warning of such a push to stderr, but allow the push to |
| 2721 | proceed. If set to false or "ignore", allow such pushes with no |
| Junio C Hamano | afb395b | 2010-03-17 22:16:15 | [diff] [blame] | 2722 | message. Defaults to "refuse". |
| Junio C Hamano | 6df93d9 | 2014-12-22 22:48:09 | [diff] [blame] | 2723 | + |
| 2724 | Another option is "updateInstead" which will update the working |
| Junio C Hamano | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 2725 | tree if pushing into the current branch. This option is |
| Junio C Hamano | 6df93d9 | 2014-12-22 22:48:09 | [diff] [blame] | 2726 | intended for synchronizing working directories when one side is not easily |
| 2727 | accessible via interactive ssh (e.g. a live web site, hence the requirement |
| 2728 | that the working directory be clean). This mode also comes in handy when |
| 2729 | developing inside a VM to test and fix code on different Operating Systems. |
| Junio C Hamano | 6bb32e6 | 2015-02-17 22:11:26 | [diff] [blame] | 2730 | + |
| 2731 | By default, "updateInstead" will refuse the push if the working tree or |
| 2732 | the index have any difference from the HEAD, but the `push-to-checkout` |
| 2733 | hook can be used to customize this. See linkgit:githooks[5]. |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2734 | |
| 2735 | receive.denyNonFastForwards:: |
| 2736 | 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] | 2737 | 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] | 2738 | even if that push is forced. This configuration variable is |
| 2739 | set when initializing a shared repository. |
| 2740 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2741 | receive.hideRefs:: |
| Junio C Hamano | b6aa12e | 2015-08-19 22:40:17 | [diff] [blame] | 2742 | This variable is the same as `transfer.hideRefs`, but applies |
| 2743 | only to `receive-pack` (and so affects pushes, but not fetches). |
| 2744 | An attempt to update or delete a hidden ref by `git push` is |
| 2745 | rejected. |
| Junio C Hamano | 80ad00d | 2013-02-18 00:19:03 | [diff] [blame] | 2746 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2747 | receive.updateServerInfo:: |
| Junio C Hamano | 621e123 | 2009-10-26 05:16:47 | [diff] [blame] | 2748 | If set to true, git-receive-pack will run git-update-server-info |
| 2749 | after receiving data from git-push and updating refs. |
| 2750 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2751 | receive.shallowUpdate:: |
| Junio C Hamano | 61525f9 | 2014-01-17 22:46:49 | [diff] [blame] | 2752 | If set to true, .git/shallow can be updated when new refs |
| 2753 | require new shallow roots. Otherwise those refs are rejected. |
| 2754 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2755 | remote.pushDefault:: |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 2756 | The remote to push to by default. Overrides |
| 2757 | `branch.<name>.remote` for all branches, and is overridden by |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2758 | `branch.<name>.pushRemote` for specific branches. |
| Junio C Hamano | 63b6fdb | 2013-04-07 23:37:13 | [diff] [blame] | 2759 | |
| Junio C Hamano | 249572f | 2006-10-24 05:44:08 | [diff] [blame] | 2760 | remote.<name>.url:: |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2761 | The URL of a remote repository. See linkgit:git-fetch[1] or |
| 2762 | linkgit:git-push[1]. |
| Junio C Hamano | 249572f | 2006-10-24 05:44:08 | [diff] [blame] | 2763 | |
| Junio C Hamano | 0e88f3e | 2009-06-21 08:03:25 | [diff] [blame] | 2764 | remote.<name>.pushurl:: |
| 2765 | The push URL of a remote repository. See linkgit:git-push[1]. |
| 2766 | |
| Junio C Hamano | 5825687 | 2007-12-04 08:31:13 | [diff] [blame] | 2767 | remote.<name>.proxy:: |
| 2768 | For remotes that require curl (http, https and ftp), the URL to |
| 2769 | the proxy to use for that remote. Set to the empty string to |
| 2770 | disable proxying for that remote. |
| 2771 | |
| Junio C Hamano | ffe10ca | 2016-02-04 00:44:23 | [diff] [blame] | 2772 | remote.<name>.proxyAuthMethod:: |
| 2773 | For remotes that require curl (http, https and ftp), the method to use for |
| 2774 | authenticating against the proxy in use (probably set in |
| 2775 | `remote.<name>.proxy`). See `http.proxyAuthMethod`. |
| 2776 | |
| Junio C Hamano | 249572f | 2006-10-24 05:44:08 | [diff] [blame] | 2777 | remote.<name>.fetch:: |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2778 | The default set of "refspec" for linkgit:git-fetch[1]. See |
| 2779 | linkgit:git-fetch[1]. |
| Junio C Hamano | 249572f | 2006-10-24 05:44:08 | [diff] [blame] | 2780 | |
| 2781 | remote.<name>.push:: |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2782 | The default set of "refspec" for linkgit:git-push[1]. See |
| 2783 | linkgit:git-push[1]. |
| Junio C Hamano | 249572f | 2006-10-24 05:44:08 | [diff] [blame] | 2784 | |
| Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 2785 | remote.<name>.mirror:: |
| 2786 | If true, pushing to this remote will automatically behave |
| Junio C Hamano | b76a686 | 2012-05-02 22:02:46 | [diff] [blame] | 2787 | as if the `--mirror` option was given on the command line. |
| Junio C Hamano | 47d68a5 | 2008-05-06 06:35:40 | [diff] [blame] | 2788 | |
| Junio C Hamano | 118d277 | 2007-02-21 20:24:10 | [diff] [blame] | 2789 | remote.<name>.skipDefaultUpdate:: |
| 2790 | If true, this remote will be skipped by default when updating |
| Junio C Hamano | 9df0c66 | 2009-11-23 11:09:27 | [diff] [blame] | 2791 | using linkgit:git-fetch[1] or the `update` subcommand of |
| 2792 | linkgit:git-remote[1]. |
| 2793 | |
| 2794 | remote.<name>.skipFetchAll:: |
| 2795 | If true, this remote will be skipped by default when updating |
| 2796 | using linkgit:git-fetch[1] or the `update` subcommand of |
| 2797 | linkgit:git-remote[1]. |
| Junio C Hamano | 118d277 | 2007-02-21 20:24:10 | [diff] [blame] | 2798 | |
| Junio C Hamano | 4ad294b | 2007-01-20 02:22:50 | [diff] [blame] | 2799 | remote.<name>.receivepack:: |
| Junio C Hamano | 54ea8d3 | 2007-01-25 07:59:48 | [diff] [blame] | 2800 | The default program to execute on the remote side when pushing. See |
| Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 2801 | option --receive-pack of linkgit:git-push[1]. |
| Junio C Hamano | 4ad294b | 2007-01-20 02:22:50 | [diff] [blame] | 2802 | |
| Junio C Hamano | 54ea8d3 | 2007-01-25 07:59:48 | [diff] [blame] | 2803 | remote.<name>.uploadpack:: |
| 2804 | The default program to execute on the remote side when fetching. See |
| Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 2805 | option --upload-pack of linkgit:git-fetch-pack[1]. |
| Junio C Hamano | 54ea8d3 | 2007-01-25 07:59:48 | [diff] [blame] | 2806 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2807 | remote.<name>.tagOpt:: |
| Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 2808 | Setting this value to --no-tags disables automatic tag following when |
| 2809 | fetching from remote <name>. Setting it to --tags will fetch every |
| Junio C Hamano | cc7636a | 2010-05-21 14:57:53 | [diff] [blame] | 2810 | tag from remote <name>, even if they are not reachable from remote |
| Junio C Hamano | 075ae87 | 2010-09-01 18:43:07 | [diff] [blame] | 2811 | branch heads. Passing these flags directly to linkgit:git-fetch[1] can |
| Junio C Hamano | 1dbca52 | 2015-05-22 20:48:55 | [diff] [blame] | 2812 | override this setting. See options --tags and --no-tags of |
| Junio C Hamano | 075ae87 | 2010-09-01 18:43:07 | [diff] [blame] | 2813 | linkgit:git-fetch[1]. |
| Junio C Hamano | 17dde0e | 2007-02-26 09:50:21 | [diff] [blame] | 2814 | |
| Junio C Hamano | 096dde2 | 2009-12-26 23:14:11 | [diff] [blame] | 2815 | remote.<name>.vcs:: |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2816 | Setting this to a value <vcs> will cause Git to interact with |
| Junio C Hamano | 096dde2 | 2009-12-26 23:14:11 | [diff] [blame] | 2817 | the remote with the git-remote-<vcs> helper. |
| 2818 | |
| Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 2819 | remote.<name>.prune:: |
| 2820 | When set to true, fetching from this remote by default will also |
| Junio C Hamano | 4c8f2d9 | 2013-12-13 00:55:42 | [diff] [blame] | 2821 | remove any remote-tracking references that no longer exist on the |
| 2822 | remote (as if the `--prune` option was given on the command line). |
| Junio C Hamano | 8eac268 | 2013-09-09 22:35:20 | [diff] [blame] | 2823 | Overrides `fetch.prune` settings, if any. |
| 2824 | |
| Junio C Hamano | 118d277 | 2007-02-21 20:24:10 | [diff] [blame] | 2825 | remotes.<group>:: |
| 2826 | The list of remotes which are fetched by "git remote update |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2827 | <group>". See linkgit:git-remote[1]. |
| Junio C Hamano | 118d277 | 2007-02-21 20:24:10 | [diff] [blame] | 2828 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2829 | repack.useDeltaBaseOffset:: |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 2830 | By default, linkgit:git-repack[1] creates packs that use |
| 2831 | delta-base offset. If you need to share your repository with |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2832 | Git older than version 1.4.4, either directly or via a dumb |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 2833 | protocol such as http, then you need to set this option to |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2834 | "false" and repack. Access from old Git versions over the |
| Junio C Hamano | fce7c7e | 2008-07-02 03:06:38 | [diff] [blame] | 2835 | native protocol are unaffected by this option. |
| Junio C Hamano | 77b7e90 | 2006-10-23 07:18:50 | [diff] [blame] | 2836 | |
| Junio C Hamano | 3b0cdc2 | 2014-03-18 22:06:16 | [diff] [blame] | 2837 | repack.packKeptObjects:: |
| 2838 | If set to true, makes `git repack` act as if |
| 2839 | `--pack-kept-objects` was passed. See linkgit:git-repack[1] for |
| 2840 | details. Defaults to `false` normally, but `true` if a bitmap |
| 2841 | index is being written (either via `--write-bitmap-index` or |
| Junio C Hamano | 38d0253 | 2014-06-26 21:48:50 | [diff] [blame] | 2842 | `repack.writeBitmaps`). |
| 2843 | |
| 2844 | repack.writeBitmaps:: |
| 2845 | When true, git will write a bitmap index when packing all |
| 2846 | objects to disk (e.g., when `git repack -a` is run). This |
| 2847 | index can speed up the "counting objects" phase of subsequent |
| 2848 | packs created for clones and fetches, at the cost of some disk |
| Junio C Hamano | 74fd0fc | 2016-05-10 21:23:56 | [diff] [blame] | 2849 | space and extra time spent on the initial repack. This has |
| 2850 | no effect if multiple packfiles are created. |
| 2851 | Defaults to false. |
| Junio C Hamano | 3b0cdc2 | 2014-03-18 22:06:16 | [diff] [blame] | 2852 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2853 | rerere.autoUpdate:: |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2854 | When set to true, `git-rerere` updates the index with the |
| 2855 | resulting contents after it cleanly resolves conflicts using |
| 2856 | previously recorded resolution. Defaults to false. |
| 2857 | |
| 2858 | rerere.enabled:: |
| 2859 | Activate recording of resolved conflicts, so that identical |
| Junio C Hamano | 4fd2442 | 2012-01-06 21:52:43 | [diff] [blame] | 2860 | conflict hunks can be resolved automatically, should they be |
| 2861 | encountered again. By default, linkgit:git-rerere[1] is |
| 2862 | enabled if there is an `rr-cache` directory under the |
| Junio C Hamano | 864ba89 | 2012-01-13 17:42:05 | [diff] [blame] | 2863 | `$GIT_DIR`, e.g. if "rerere" was previously used in the |
| 2864 | repository. |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 2865 | |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2866 | sendemail.identity:: |
| 2867 | A configuration identity. When given, causes values in the |
| 2868 | 'sendemail.<identity>' subsection to take precedence over |
| 2869 | values in the 'sendemail' section. The default identity is |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 2870 | the value of `sendemail.identity`. |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2871 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2872 | sendemail.smtpEncryption:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2873 | See linkgit:git-send-email[1] for description. Note that this |
| 2874 | setting is not subject to the 'identity' mechanism. |
| 2875 | |
| Junio C Hamano | be08798 | 2015-02-22 21:29:39 | [diff] [blame] | 2876 | sendemail.smtpssl (deprecated):: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2877 | Deprecated alias for 'sendemail.smtpEncryption = ssl'. |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2878 | |
| Junio C Hamano | 58f587a | 2013-07-22 19:20:59 | [diff] [blame] | 2879 | sendemail.smtpsslcertpath:: |
| 2880 | Path to ca-certificates (either a directory or a single file). |
| 2881 | Set it to an empty string to disable certificate verification. |
| 2882 | |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2883 | sendemail.<identity>.*:: |
| 2884 | Identity-specific versions of the 'sendemail.*' parameters |
| 2885 | found below, taking precedence over those when the this |
| 2886 | identity is selected, through command-line or |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 2887 | `sendemail.identity`. |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2888 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2889 | sendemail.aliasesFile:: |
| 2890 | sendemail.aliasFileType:: |
| Junio C Hamano | ea3b752 | 2013-04-18 19:37:53 | [diff] [blame] | 2891 | sendemail.annotate:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2892 | sendemail.bcc:: |
| 2893 | sendemail.cc:: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2894 | sendemail.ccCmd:: |
| 2895 | sendemail.chainReplyTo:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2896 | sendemail.confirm:: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2897 | sendemail.envelopeSender:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2898 | sendemail.from:: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2899 | sendemail.multiEdit:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2900 | sendemail.signedoffbycc:: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2901 | sendemail.smtpPass:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2902 | sendemail.suppresscc:: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2903 | sendemail.suppressFrom:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2904 | sendemail.to:: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2905 | sendemail.smtpDomain:: |
| 2906 | sendemail.smtpServer:: |
| 2907 | sendemail.smtpServerPort:: |
| 2908 | sendemail.smtpServerOption:: |
| 2909 | sendemail.smtpUser:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2910 | sendemail.thread:: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2911 | sendemail.transferEncoding:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2912 | sendemail.validate:: |
| Junio C Hamano | c9394b2 | 2015-01-07 22:45:48 | [diff] [blame] | 2913 | sendemail.xmailer:: |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2914 | See linkgit:git-send-email[1] for description. |
| 2915 | |
| Junio C Hamano | be08798 | 2015-02-22 21:29:39 | [diff] [blame] | 2916 | sendemail.signedoffcc (deprecated):: |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 2917 | Deprecated alias for `sendemail.signedoffbycc`. |
| Junio C Hamano | 1bbd0f4 | 2009-07-23 06:20:29 | [diff] [blame] | 2918 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 2919 | showbranch.default:: |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2920 | The default set of branches for linkgit:git-show-branch[1]. |
| 2921 | See linkgit:git-show-branch[1]. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 2922 | |
| Junio C Hamano | 3d4a66d | 2017-03-17 21:07:26 | [diff] [blame] | 2923 | splitIndex.maxPercentChange:: |
| 2924 | When the split index feature is used, this specifies the |
| 2925 | percent of entries the split index can contain compared to the |
| 2926 | total number of entries in both the split index and the shared |
| 2927 | index before a new shared index is written. |
| 2928 | The value should be between 0 and 100. If the value is 0 then |
| 2929 | a new shared index is always written, if it is 100 a new |
| 2930 | shared index is never written. |
| 2931 | By default the value is 20, so a new shared index is written |
| 2932 | if the number of entries in the split index would be greater |
| 2933 | than 20 percent of the total number of entries. |
| 2934 | See linkgit:git-update-index[1]. |
| 2935 | |
| 2936 | splitIndex.sharedIndexExpire:: |
| 2937 | When the split index feature is used, shared index files that |
| 2938 | were not modified since the time this variable specifies will |
| 2939 | be removed when a new shared index file is created. The value |
| 2940 | "now" expires all entries immediately, and "never" suppresses |
| 2941 | expiration altogether. |
| 2942 | The default value is "2.weeks.ago". |
| 2943 | Note that a shared index file is considered modified (for the |
| 2944 | purpose of expiration) each time a new split-index file is |
| 2945 | either created based on it or read from it. |
| 2946 | See linkgit:git-update-index[1]. |
| 2947 | |
| Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 2948 | status.relativePaths:: |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 2949 | By default, linkgit:git-status[1] shows paths relative to the |
| Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 2950 | current directory. Setting this variable to `false` shows paths |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 2951 | relative to the repository root (this was the default for Git |
| Junio C Hamano | 942b35e | 2007-12-09 10:19:33 | [diff] [blame] | 2952 | prior to v1.5.4). |
| 2953 | |
| Junio C Hamano | 5865559 | 2013-07-11 20:52:33 | [diff] [blame] | 2954 | status.short:: |
| 2955 | Set to true to enable --short by default in linkgit:git-status[1]. |
| 2956 | The option --no-short takes precedence over this variable. |
| 2957 | |
| 2958 | status.branch:: |
| 2959 | Set to true to enable --branch by default in linkgit:git-status[1]. |
| 2960 | The option --no-branch takes precedence over this variable. |
| 2961 | |
| Junio C Hamano | 79f4c7c | 2013-09-20 21:03:37 | [diff] [blame] | 2962 | status.displayCommentPrefix:: |
| 2963 | If set to true, linkgit:git-status[1] will insert a comment |
| 2964 | prefix before each output line (starting with |
| 2965 | `core.commentChar`, i.e. `#` by default). This was the |
| 2966 | behavior of linkgit:git-status[1] in Git 1.8.4 and previous. |
| 2967 | Defaults to false. |
| 2968 | |
| Junio C Hamano | 4224f99 | 2008-06-23 07:14:08 | [diff] [blame] | 2969 | status.showUntrackedFiles:: |
| 2970 | By default, linkgit:git-status[1] and linkgit:git-commit[1] show |
| 2971 | files which are not currently tracked by Git. Directories which |
| 2972 | contain only untracked files, are shown with the directory name |
| 2973 | only. Showing untracked files means that Git needs to lstat() all |
| Junio C Hamano | 2efd5e4 | 2014-11-10 22:38:52 | [diff] [blame] | 2974 | the files in the whole repository, which might be slow on some |
| Junio C Hamano | 4224f99 | 2008-06-23 07:14:08 | [diff] [blame] | 2975 | systems. So, this variable controls how the commands displays |
| 2976 | the untracked files. Possible values are: |
| 2977 | + |
| 2978 | -- |
| Junio C Hamano | 7f9fa86 | 2010-10-19 23:51:14 | [diff] [blame] | 2979 | * `no` - Show no untracked files. |
| 2980 | * `normal` - Show untracked files and directories. |
| 2981 | * `all` - Show also individual files in untracked directories. |
| Junio C Hamano | 4224f99 | 2008-06-23 07:14:08 | [diff] [blame] | 2982 | -- |
| 2983 | + |
| 2984 | If this variable is not specified, it defaults to 'normal'. |
| 2985 | This variable can be overridden with the -u|--untracked-files option |
| 2986 | of linkgit:git-status[1] and linkgit:git-commit[1]. |
| 2987 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 2988 | status.submoduleSummary:: |
| Junio C Hamano | b671fb5 | 2010-06-01 05:06:14 | [diff] [blame] | 2989 | Defaults to false. |
| 2990 | If this is set to a non zero number or true (identical to -1 or an |
| 2991 | unlimited number), the submodule summary will be enabled and a |
| 2992 | summary of commits for modified submodules will be shown (see |
| Junio C Hamano | 369e340 | 2013-10-15 18:40:25 | [diff] [blame] | 2993 | --summary-limit option of linkgit:git-submodule[1]). Please note |
| 2994 | that the summary output command will be suppressed for all |
| 2995 | submodules when `diff.ignoreSubmodules` is set to 'all' or only |
| Junio C Hamano | c8c398a | 2014-06-16 21:14:05 | [diff] [blame] | 2996 | for those submodules where `submodule.<name>.ignore=all`. The only |
| 2997 | exception to that rule is that status and commit will show staged |
| 2998 | submodule changes. To |
| Junio C Hamano | 369e340 | 2013-10-15 18:40:25 | [diff] [blame] | 2999 | also view the summary for ignored submodules you can either use |
| Junio C Hamano | e1aeb5e | 2014-06-06 19:16:29 | [diff] [blame] | 3000 | the --ignore-submodules=dirty command-line option or the 'git |
| Junio C Hamano | 369e340 | 2013-10-15 18:40:25 | [diff] [blame] | 3001 | submodule summary' command, which shows a similar output but does |
| 3002 | not honor these settings. |
| Junio C Hamano | b671fb5 | 2010-06-01 05:06:14 | [diff] [blame] | 3003 | |
| Junio C Hamano | 1eb5609 | 2015-10-05 20:39:53 | [diff] [blame] | 3004 | stash.showPatch:: |
| 3005 | If this is set to true, the `git stash show` command without an |
| 3006 | option will show the stash in patch form. Defaults to false. |
| 3007 | See description of 'show' command in linkgit:git-stash[1]. |
| 3008 | |
| 3009 | stash.showStat:: |
| 3010 | If this is set to true, the `git stash show` command without an |
| 3011 | option will show diffstat of the stash. Defaults to true. |
| 3012 | See description of 'show' command in linkgit:git-stash[1]. |
| 3013 | |
| Junio C Hamano | 78e3a78 | 2010-07-15 22:24:45 | [diff] [blame] | 3014 | submodule.<name>.url:: |
| Junio C Hamano | c0859f7 | 2016-10-17 22:22:57 | [diff] [blame] | 3015 | The URL for a submodule. This variable is copied from the .gitmodules |
| 3016 | file to the git config via 'git submodule init'. The user can change |
| 3017 | the configured URL before obtaining the submodule via 'git submodule |
| Junio C Hamano | dc8d0c3 | 2017-03-30 23:00:21 | [diff] [blame] | 3018 | update'. If neither submodule.<name>.active or submodule.active are |
| 3019 | set, the presence of this variable is used as a fallback to indicate |
| 3020 | whether the submodule is of interest to git commands. |
| Junio C Hamano | c0859f7 | 2016-10-17 22:22:57 | [diff] [blame] | 3021 | See linkgit:git-submodule[1] and linkgit:gitmodules[5] for details. |
| Junio C Hamano | 6bf68cf | 2015-03-06 23:46:29 | [diff] [blame] | 3022 | |
| Junio C Hamano | 78e3a78 | 2010-07-15 22:24:45 | [diff] [blame] | 3023 | submodule.<name>.update:: |
| Junio C Hamano | 6bf68cf | 2015-03-06 23:46:29 | [diff] [blame] | 3024 | The default update procedure for a submodule. This variable |
| 3025 | is populated by `git submodule init` from the |
| 3026 | linkgit:gitmodules[5] file. See description of 'update' |
| 3027 | command in linkgit:git-submodule[1]. |
| Junio C Hamano | 78e3a78 | 2010-07-15 22:24:45 | [diff] [blame] | 3028 | |
| Junio C Hamano | abad6da | 2013-01-06 09:06:32 | [diff] [blame] | 3029 | submodule.<name>.branch:: |
| 3030 | The remote branch name for a submodule, used by `git submodule |
| 3031 | update --remote`. Set this option to override the value found in |
| 3032 | the `.gitmodules` file. See linkgit:git-submodule[1] and |
| 3033 | linkgit:gitmodules[5] for details. |
| 3034 | |
| Junio C Hamano | 0d75e87 | 2010-12-17 06:57:26 | [diff] [blame] | 3035 | submodule.<name>.fetchRecurseSubmodules:: |
| Junio C Hamano | 5cd1518 | 2011-04-05 00:21:10 | [diff] [blame] | 3036 | This option can be used to control recursive fetching of this |
| Junio C Hamano | 7165bf7 | 2011-01-04 22:06:18 | [diff] [blame] | 3037 | submodule. It can be overridden by using the --[no-]recurse-submodules |
| Junio C Hamano | e1aeb5e | 2014-06-06 19:16:29 | [diff] [blame] | 3038 | command-line option to "git fetch" and "git pull". |
| Junio C Hamano | 0d75e87 | 2010-12-17 06:57:26 | [diff] [blame] | 3039 | This setting will override that from in the linkgit:gitmodules[5] |
| 3040 | file. |
| 3041 | |
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 3042 | submodule.<name>.ignore:: |
| 3043 | Defines under what circumstances "git status" and the diff family show |
| 3044 | a submodule as modified. When set to "all", it will never be considered |
| Junio C Hamano | c8c398a | 2014-06-16 21:14:05 | [diff] [blame] | 3045 | modified (but it will nonetheless show up in the output of status and |
| 3046 | commit when it has been staged), "dirty" will ignore all changes |
| 3047 | to the submodules work tree and |
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 3048 | takes only differences between the HEAD of the submodule and the commit |
| 3049 | recorded in the superproject into account. "untracked" will additionally |
| 3050 | let submodules with modified tracked files in their work tree show up. |
| 3051 | Using "none" (the default when this option is not set) also shows |
| 3052 | submodules that have untracked files in their work tree as changed. |
| 3053 | This setting overrides any setting made in .gitmodules for this submodule, |
| Junio C Hamano | de9745c | 2010-08-23 17:10:18 | [diff] [blame] | 3054 | both settings can be overridden on the command line by using the |
| Junio C Hamano | 369e340 | 2013-10-15 18:40:25 | [diff] [blame] | 3055 | "--ignore-submodules" option. The 'git submodule' commands are not |
| 3056 | affected by this setting. |
| Junio C Hamano | 619596a | 2010-08-18 22:15:35 | [diff] [blame] | 3057 | |
| Junio C Hamano | dc8d0c3 | 2017-03-30 23:00:21 | [diff] [blame] | 3058 | submodule.<name>.active:: |
| 3059 | Boolean value indicating if the submodule is of interest to git |
| 3060 | commands. This config option takes precedence over the |
| 3061 | submodule.active config option. |
| 3062 | |
| 3063 | submodule.active:: |
| 3064 | A repeated field which contains a pathspec used to match against a |
| 3065 | submodule's path to determine if the submodule is of interest to git |
| 3066 | commands. |
| 3067 | |
| Junio C Hamano | bec5da4 | 2016-04-06 22:58:21 | [diff] [blame] | 3068 | submodule.fetchJobs:: |
| 3069 | Specifies how many submodules are fetched/cloned at the same time. |
| 3070 | A positive integer allows up to that number of submodules fetched |
| 3071 | in parallel. A value of 0 will give some reasonable default. |
| 3072 | If unset, it defaults to 1. |
| 3073 | |
| Junio C Hamano | cd45166 | 2016-09-13 00:54:09 | [diff] [blame] | 3074 | submodule.alternateLocation:: |
| 3075 | Specifies how the submodules obtain alternates when submodules are |
| 3076 | cloned. Possible values are `no`, `superproject`. |
| 3077 | By default `no` is assumed, which doesn't add references. When the |
| 3078 | value is set to `superproject` the submodule to be cloned computes |
| 3079 | its alternates location relative to the superprojects alternate. |
| 3080 | |
| Junio C Hamano | ce01de8 | 2017-02-16 22:59:12 | [diff] [blame] | 3081 | submodule.alternateErrorStrategy:: |
| Junio C Hamano | cd45166 | 2016-09-13 00:54:09 | [diff] [blame] | 3082 | Specifies how to treat errors with the alternates for a submodule |
| 3083 | as computed via `submodule.alternateLocation`. Possible values are |
| 3084 | `ignore`, `info`, `die`. Default is `die`. |
| 3085 | |
| Junio C Hamano | bec5da4 | 2016-04-06 22:58:21 | [diff] [blame] | 3086 | tag.forceSignAnnotated:: |
| 3087 | A boolean to specify whether annotated tags created should be GPG signed. |
| 3088 | If `--annotate` is specified on the command line, it takes |
| 3089 | precedence over this option. |
| 3090 | |
| Junio C Hamano | 7b43d41 | 2014-07-23 23:09:44 | [diff] [blame] | 3091 | tag.sort:: |
| 3092 | This variable controls the sort ordering of tags when displayed by |
| 3093 | linkgit:git-tag[1]. Without the "--sort=<value>" option provided, the |
| 3094 | value of this variable will be used as the default. |
| 3095 | |
| Junio C Hamano | 75cc4c9 | 2006-07-24 08:25:03 | [diff] [blame] | 3096 | tar.umask:: |
| Junio C Hamano | bdebabb | 2007-08-23 00:25:09 | [diff] [blame] | 3097 | This variable can be used to restrict the permission bits of |
| 3098 | tar archive entries. The default is 0002, which turns off the |
| 3099 | world write bit. The special value "user" indicates that the |
| 3100 | archiving user's umask will be used instead. See umask(2) and |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 3101 | linkgit:git-archive[1]. |
| Junio C Hamano | 75cc4c9 | 2006-07-24 08:25:03 | [diff] [blame] | 3102 | |
| Junio C Hamano | 8fb66e5 | 2011-10-05 20:59:51 | [diff] [blame] | 3103 | transfer.fsckObjects:: |
| 3104 | When `fetch.fsckObjects` or `receive.fsckObjects` are |
| 3105 | not set, the value of this variable is used instead. |
| 3106 | Defaults to false. |
| 3107 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 3108 | transfer.hideRefs:: |
| Junio C Hamano | b6aa12e | 2015-08-19 22:40:17 | [diff] [blame] | 3109 | String(s) `receive-pack` and `upload-pack` use to decide which |
| 3110 | refs to omit from their initial advertisements. Use more than |
| 3111 | one definition to specify multiple prefix strings. A ref that is |
| 3112 | under the hierarchies listed in the value of this variable is |
| 3113 | excluded, and is hidden when responding to `git push` or `git |
| 3114 | fetch`. See `receive.hideRefs` and `uploadpack.hideRefs` for |
| 3115 | program-specific versions of this config. |
| 3116 | + |
| 3117 | You may also include a `!` in front of the ref name to negate the entry, |
| 3118 | explicitly exposing it, even if an earlier entry marked it as hidden. |
| 3119 | If you have multiple hideRefs values, later entries override earlier ones |
| 3120 | (and entries in more-specific config files override less-specific ones). |
| Junio C Hamano | 713eded | 2015-12-03 00:24:02 | [diff] [blame] | 3121 | + |
| 3122 | If a namespace is in use, the namespace prefix is stripped from each |
| 3123 | reference before it is matched against `transfer.hiderefs` patterns. |
| 3124 | For example, if `refs/heads/master` is specified in `transfer.hideRefs` and |
| 3125 | the current namespace is `foo`, then `refs/namespaces/foo/refs/heads/master` |
| 3126 | is omitted from the advertisements but `refs/heads/master` and |
| 3127 | `refs/namespaces/bar/refs/heads/master` are still advertised as so-called |
| 3128 | "have" lines. In order to match refs before stripping, add a `^` in front of |
| 3129 | the ref name. If you combine `!` and `^`, `!` must be specified first. |
| Junio C Hamano | 56ace3d | 2017-01-10 23:43:41 | [diff] [blame] | 3130 | + |
| 3131 | Even if you hide refs, a client may still be able to steal the target |
| 3132 | objects via the techniques described in the "SECURITY" section of the |
| 3133 | linkgit:gitnamespaces[7] man page; it's best to keep private data in a |
| 3134 | separate repository. |
| Junio C Hamano | 80ad00d | 2013-02-18 00:19:03 | [diff] [blame] | 3135 | |
| Junio C Hamano | 4653c6f | 2008-11-26 22:50:20 | [diff] [blame] | 3136 | transfer.unpackLimit:: |
| 3137 | When `fetch.unpackLimit` or `receive.unpackLimit` are |
| 3138 | not set, the value of this variable is used instead. |
| 3139 | The default value is 100. |
| 3140 | |
| Junio C Hamano | 81703b2 | 2014-03-14 22:00:27 | [diff] [blame] | 3141 | uploadarchive.allowUnreachable:: |
| 3142 | If true, allow clients to use `git archive --remote` to request |
| 3143 | any tree, whether reachable from the ref tips or not. See the |
| Junio C Hamano | 56ace3d | 2017-01-10 23:43:41 | [diff] [blame] | 3144 | discussion in the "SECURITY" section of |
| Junio C Hamano | 81703b2 | 2014-03-14 22:00:27 | [diff] [blame] | 3145 | linkgit:git-upload-archive[1] for more details. Defaults to |
| 3146 | `false`. |
| 3147 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 3148 | uploadpack.hideRefs:: |
| Junio C Hamano | b6aa12e | 2015-08-19 22:40:17 | [diff] [blame] | 3149 | This variable is the same as `transfer.hideRefs`, but applies |
| 3150 | only to `upload-pack` (and so affects only fetches, not pushes). |
| 3151 | An attempt to fetch a hidden ref by `git fetch` will fail. See |
| 3152 | also `uploadpack.allowTipSHA1InWant`. |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 3153 | |
| Junio C Hamano | 85f1fde | 2015-06-01 20:37:32 | [diff] [blame] | 3154 | uploadpack.allowTipSHA1InWant:: |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 3155 | When `uploadpack.hideRefs` is in effect, allow `upload-pack` |
| Junio C Hamano | 5e7f131 | 2013-03-21 22:49:01 | [diff] [blame] | 3156 | to accept a fetch request that asks for an object at the tip |
| 3157 | of a hidden ref (by default, such a request is rejected). |
| Junio C Hamano | 56ace3d | 2017-01-10 23:43:41 | [diff] [blame] | 3158 | See also `uploadpack.hideRefs`. Even if this is false, a client |
| 3159 | may be able to steal objects via the techniques described in the |
| 3160 | "SECURITY" section of the linkgit:gitnamespaces[7] man page; it's |
| 3161 | best to keep private data in a separate repository. |
| Junio C Hamano | 80ad00d | 2013-02-18 00:19:03 | [diff] [blame] | 3162 | |
| Junio C Hamano | 85f1fde | 2015-06-01 20:37:32 | [diff] [blame] | 3163 | uploadpack.allowReachableSHA1InWant:: |
| 3164 | Allow `upload-pack` to accept a fetch request that asks for an |
| 3165 | object that is reachable from any ref tip. However, note that |
| 3166 | calculating object reachability is computationally expensive. |
| Junio C Hamano | 56ace3d | 2017-01-10 23:43:41 | [diff] [blame] | 3167 | Defaults to `false`. Even if this is false, a client may be able |
| 3168 | to steal objects via the techniques described in the "SECURITY" |
| 3169 | section of the linkgit:gitnamespaces[7] man page; it's best to |
| 3170 | keep private data in a separate repository. |
| 3171 | |
| 3172 | uploadpack.allowAnySHA1InWant:: |
| 3173 | Allow `upload-pack` to accept a fetch request that asks for any |
| 3174 | object at all. |
| Junio C Hamano | 85f1fde | 2015-06-01 20:37:32 | [diff] [blame] | 3175 | Defaults to `false`. |
| 3176 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 3177 | uploadpack.keepAlive:: |
| Junio C Hamano | 79f4c7c | 2013-09-20 21:03:37 | [diff] [blame] | 3178 | When `upload-pack` has started `pack-objects`, there may be a |
| 3179 | quiet period while `pack-objects` prepares the pack. Normally |
| 3180 | it would output progress information, but if `--quiet` was used |
| 3181 | for the fetch, `pack-objects` will output nothing at all until |
| 3182 | the pack data begins. Some clients and networks may consider |
| 3183 | the server to be hung and give up. Setting this option instructs |
| 3184 | `upload-pack` to send an empty keepalive packet every |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 3185 | `uploadpack.keepAlive` seconds. Setting this option to 0 |
| Junio C Hamano | 79f4c7c | 2013-09-20 21:03:37 | [diff] [blame] | 3186 | disables keepalive packets entirely. The default is 5 seconds. |
| 3187 | |
| Junio C Hamano | c6c919b | 2016-07-06 21:34:15 | [diff] [blame] | 3188 | uploadpack.packObjectsHook:: |
| 3189 | If this option is set, when `upload-pack` would run |
| 3190 | `git pack-objects` to create a packfile for a client, it will |
| 3191 | run this shell command instead. The `pack-objects` command and |
| 3192 | arguments it _would_ have run (including the `git pack-objects` |
| 3193 | at the beginning) are appended to the shell command. The stdin |
| 3194 | and stdout of the hook are treated as if `pack-objects` itself |
| 3195 | was run. I.e., `upload-pack` will feed input intended for |
| 3196 | `pack-objects` to the hook, and expects a completed packfile on |
| 3197 | stdout. |
| 3198 | + |
| 3199 | Note that this configuration variable is ignored if it is seen in the |
| 3200 | repository-level config (this is a safety measure against fetching from |
| 3201 | untrusted repositories). |
| 3202 | |
| Junio C Hamano | 24bc09a | 2008-02-28 00:27:44 | [diff] [blame] | 3203 | url.<base>.insteadOf:: |
| 3204 | Any URL that starts with this value will be rewritten to |
| 3205 | start, instead, with <base>. In cases where some site serves a |
| 3206 | large number of repositories, and serves them with multiple |
| 3207 | access methods, and some users need to use different access |
| 3208 | methods, this feature allows people to specify any of the |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 3209 | equivalent URLs and have Git automatically rewrite the URL to |
| Junio C Hamano | 24bc09a | 2008-02-28 00:27:44 | [diff] [blame] | 3210 | the best alternative for the particular user, even for a |
| 3211 | never-before-seen repository on the site. When more than one |
| 3212 | insteadOf strings match a given URL, the longest match is used. |
| 3213 | |
| Junio C Hamano | 7df6dcf | 2009-09-13 09:51:17 | [diff] [blame] | 3214 | url.<base>.pushInsteadOf:: |
| 3215 | Any URL that starts with this value will not be pushed to; |
| 3216 | instead, it will be rewritten to start with <base>, and the |
| 3217 | resulting URL will be pushed to. In cases where some site serves |
| 3218 | a large number of repositories, and serves them with multiple |
| 3219 | access methods, some of which do not allow push, this feature |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 3220 | allows people to specify a pull-only URL and have Git |
| Junio C Hamano | 7df6dcf | 2009-09-13 09:51:17 | [diff] [blame] | 3221 | automatically use an appropriate URL to push, even for a |
| 3222 | never-before-seen repository on the site. When more than one |
| 3223 | pushInsteadOf strings match a given URL, the longest match is |
| Junio C Hamano | 076ffcc | 2013-02-06 05:13:21 | [diff] [blame] | 3224 | used. If a remote has an explicit pushurl, Git will ignore this |
| Junio C Hamano | 7df6dcf | 2009-09-13 09:51:17 | [diff] [blame] | 3225 | setting for that remote. |
| 3226 | |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 3227 | user.email:: |
| 3228 | Your email address to be recorded in any newly created commits. |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 3229 | Can be overridden by the `GIT_AUTHOR_EMAIL`, `GIT_COMMITTER_EMAIL`, and |
| 3230 | `EMAIL` environment variables. See linkgit:git-commit-tree[1]. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 3231 | |
| 3232 | user.name:: |
| 3233 | Your full name to be recorded in any newly created commits. |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 3234 | Can be overridden by the `GIT_AUTHOR_NAME` and `GIT_COMMITTER_NAME` |
| Junio C Hamano | 35738e8 | 2008-01-07 07:55:46 | [diff] [blame] | 3235 | environment variables. See linkgit:git-commit-tree[1]. |
| Junio C Hamano | 07824ce | 2006-04-25 07:36:54 | [diff] [blame] | 3236 | |
| Junio C Hamano | f85ef63 | 2016-02-17 22:31:06 | [diff] [blame] | 3237 | user.useConfigOnly:: |
| Junio C Hamano | 042f214 | 2016-06-27 18:05:05 | [diff] [blame] | 3238 | Instruct Git to avoid trying to guess defaults for `user.email` |
| 3239 | and `user.name`, and instead retrieve the values only from the |
| Junio C Hamano | f85ef63 | 2016-02-17 22:31:06 | [diff] [blame] | 3240 | configuration. For example, if you have multiple email addresses |
| 3241 | and would like to use a different one for each repository, then |
| 3242 | with this configuration option set to `true` in the global config |
| 3243 | along with a name, Git will prompt you to set up an email before |
| 3244 | making new commits in a newly cloned repository. |
| 3245 | Defaults to `false`. |
| 3246 | |
| Junio C Hamano | 322c624 | 2015-03-23 21:32:46 | [diff] [blame] | 3247 | user.signingKey:: |
| Junio C Hamano | 369e340 | 2013-10-15 18:40:25 | [diff] [blame] | 3248 | If linkgit:git-tag[1] or linkgit:git-commit[1] is not selecting the |
| 3249 | key you want it to automatically when creating a signed tag or |
| 3250 | commit, you can override the default selection with this variable. |
| 3251 | This option is passed unchanged to gpg's --local-user parameter, |
| 3252 | so you may specify a key using any method that gpg supports. |
| Junio C Hamano | a890c4f | 2007-01-28 10:29:21 | [diff] [blame] | 3253 | |
| Junio C Hamano | bcd98f4 | 2017-01-24 00:12:16 | [diff] [blame] | 3254 | versionsort.prereleaseSuffix (deprecated):: |
| 3255 | Deprecated alias for `versionsort.suffix`. Ignored if |
| 3256 | `versionsort.suffix` is set. |
| 3257 | |
| 3258 | versionsort.suffix:: |
| 3259 | Even when version sort is used in linkgit:git-tag[1], tagnames |
| 3260 | with the same base version but different suffixes are still sorted |
| 3261 | lexicographically, resulting e.g. in prerelease tags appearing |
| 3262 | after the main release (e.g. "1.0-rc1" after "1.0"). This |
| 3263 | variable can be specified to determine the sorting order of tags |
| 3264 | with different suffixes. |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 3265 | + |
| Junio C Hamano | bcd98f4 | 2017-01-24 00:12:16 | [diff] [blame] | 3266 | By specifying a single suffix in this variable, any tagname containing |
| 3267 | that suffix will appear before the corresponding main release. E.g. if |
| 3268 | the variable is set to "-rc", then all "1.0-rcX" tags will appear before |
| 3269 | "1.0". If specified multiple times, once per suffix, then the order of |
| 3270 | suffixes in the configuration will determine the sorting order of tagnames |
| 3271 | with those suffixes. E.g. if "-pre" appears before "-rc" in the |
| 3272 | configuration, then all "1.0-preX" tags will be listed before any |
| 3273 | "1.0-rcX" tags. The placement of the main release tag relative to tags |
| 3274 | with various suffixes can be determined by specifying the empty suffix |
| 3275 | among those other suffixes. E.g. if the suffixes "-rc", "", "-ck" and |
| 3276 | "-bfs" appear in the configuration in this order, then all "v4.8-rcX" tags |
| 3277 | are listed first, followed by "v4.8", then "v4.8-ckX" and finally |
| 3278 | "v4.8-bfsX". |
| 3279 | + |
| 3280 | If more than one suffixes match the same tagname, then that tagname will |
| 3281 | be sorted according to the suffix which starts at the earliest position in |
| 3282 | the tagname. If more than one different matching suffixes start at |
| 3283 | that earliest position, then that tagname will be sorted according to the |
| 3284 | longest of those suffixes. |
| 3285 | The sorting order between different suffixes is undefined if they are |
| 3286 | in multiple config files. |
| Junio C Hamano | 0762262 | 2015-03-20 21:47:26 | [diff] [blame] | 3287 | |
| Junio C Hamano | 4e27231 | 2008-01-08 09:13:21 | [diff] [blame] | 3288 | web.browser:: |
| 3289 | Specify a web browser that may be used by some commands. |
| 3290 | Currently only linkgit:git-instaweb[1] and linkgit:git-help[1] |
| 3291 | may use it. |