Google Git
Sign in
chromium / external / gitster / git-htmldocs / 059bca5eb69144f40505abf93f145c2e550243aa / . / git-config.html
blob: 1128e14b211333720d6162b5e88cf3554b6395b5 [file] [log] [blame]
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]6<meta name="generator" content="AsciiDoc 8.4.5" />
7<title>git-config(1)</title>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]8<style type="text/css">
9/* Debug borders */
10p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
11/*
12 border: 1px solid red;
13*/
14}
15
16body {
17 margin: 1em 5% 1em 5%;
18}
19
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]20a {
21 color: blue;
22 text-decoration: underline;
23}
24a:visited {
25 color: fuchsia;
26}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]27
28em {
29 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]30 color: navy;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]31}
32
33strong {
34 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]35 color: #083194;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]36}
37
38tt {
39 color: navy;
40}
41
42h1, h2, h3, h4, h5, h6 {
43 color: #527bbd;
44 font-family: sans-serif;
45 margin-top: 1.2em;
46 margin-bottom: 0.5em;
47 line-height: 1.3;
48}
49
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]50h1, h2, h3 {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]51 border-bottom: 2px solid silver;
52}
53h2 {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]54 padding-top: 0.5em;
55}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]56h3 {
57 float: left;
58}
59h3 + * {
60 clear: left;
61}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]62
63div.sectionbody {
64 font-family: serif;
65 margin-left: 0;
66}
67
68hr {
69 border: 1px solid silver;
70}
71
72p {
73 margin-top: 0.5em;
74 margin-bottom: 0.5em;
75}
76
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]77ul, ol, li > p {
78 margin-top: 0;
79}
80
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]81pre {
82 padding: 0;
83 margin: 0;
84}
85
86span#author {
87 color: #527bbd;
88 font-family: sans-serif;
89 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]90 font-size: 1.1em;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]91}
92span#email {
93}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]94span#revnumber, span#revdate, span#revremark {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]95 font-family: sans-serif;
96}
97
98div#footer {
99 font-family: sans-serif;
100 font-size: small;
101 border-top: 2px solid silver;
102 padding-top: 0.5em;
103 margin-top: 4.0em;
104}
105div#footer-text {
106 float: left;
107 padding-bottom: 0.5em;
108}
109div#footer-badges {
110 float: right;
111 padding-bottom: 0.5em;
112}
113
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]114div#preamble {
115 margin-top: 1.5em;
116 margin-bottom: 1.5em;
117}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]118div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
119div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
120div.admonitionblock {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]121 margin-top: 1.5em;
122 margin-bottom: 1.5em;
123}
124div.admonitionblock {
125 margin-top: 2.5em;
126 margin-bottom: 2.5em;
127}
128
129div.content { /* Block element content. */
130 padding: 0;
131}
132
133/* Block element titles. */
134div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]135 color: #527bbd;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]136 font-family: sans-serif;
137 font-weight: bold;
138 text-align: left;
139 margin-top: 1.0em;
140 margin-bottom: 0.5em;
141}
142div.title + * {
143 margin-top: 0;
144}
145
146td div.title:first-child {
147 margin-top: 0.0em;
148}
149div.content div.title:first-child {
150 margin-top: 0.0em;
151}
152div.content + div.title {
153 margin-top: 0.0em;
154}
155
156div.sidebarblock > div.content {
157 background: #ffffee;
158 border: 1px solid silver;
159 padding: 0.5em;
160}
161
162div.listingblock > div.content {
163 border: 1px solid silver;
164 background: #f4f4f4;
165 padding: 0.5em;
166}
167
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]168div.quoteblock {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]169 padding-left: 2.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]170 margin-right: 10%;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]171}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]172div.quoteblock > div.attribution {
173 padding-top: 0.5em;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]174 text-align: right;
175}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]176
177div.verseblock {
178 padding-left: 2.0em;
179 margin-right: 10%;
180}
181div.verseblock > div.content {
182 white-space: pre;
183}
184div.verseblock > div.attribution {
185 padding-top: 0.75em;
186 text-align: left;
187}
188/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]189div.verseblock + div.attribution {
190 text-align: left;
191}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]192
193div.admonitionblock .icon {
194 vertical-align: top;
195 font-size: 1.1em;
196 font-weight: bold;
197 text-decoration: underline;
198 color: #527bbd;
199 padding-right: 0.5em;
200}
201div.admonitionblock td.content {
202 padding-left: 0.5em;
203 border-left: 2px solid silver;
204}
205
206div.exampleblock > div.content {
207 border-left: 2px solid silver;
208 padding: 0.5em;
209}
210
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]211div.imageblock div.content { padding-left: 0; }
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]212span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]213a.image:visited { color: white; }
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]214
215dl {
216 margin-top: 0.8em;
217 margin-bottom: 0.8em;
218}
219dt {
220 margin-top: 0.5em;
221 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]222 font-style: normal;
223 color: navy;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]224}
225dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]226 margin-top: 0.1em;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]227}
228
229ul, ol {
230 list-style-position: outside;
231}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]232ol.arabic {
233 list-style-type: decimal;
234}
235ol.loweralpha {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]236 list-style-type: lower-alpha;
237}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]238ol.upperalpha {
239 list-style-type: upper-alpha;
240}
241ol.lowerroman {
242 list-style-type: lower-roman;
243}
244ol.upperroman {
245 list-style-type: upper-roman;
246}
247
248div.compact ul, div.compact ol,
249div.compact p, div.compact p,
250div.compact div, div.compact div {
251 margin-top: 0.1em;
252 margin-bottom: 0.1em;
253}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]254
255div.tableblock > table {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]256 border: 3px solid #527bbd;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]257}
258thead {
259 font-family: sans-serif;
260 font-weight: bold;
261}
262tfoot {
263 font-weight: bold;
264}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]265td > div.verse {
266 white-space: pre;
267}
268p.table {
269 margin-top: 0;
270}
271/* Because the table frame attribute is overriden by CSS in most browsers. */
272div.tableblock > table[frame="void"] {
273 border-style: none;
274}
275div.tableblock > table[frame="hsides"] {
276 border-left-style: none;
277 border-right-style: none;
278}
279div.tableblock > table[frame="vsides"] {
280 border-top-style: none;
281 border-bottom-style: none;
282}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]283
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]284
285div.hdlist {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]286 margin-top: 0.8em;
287 margin-bottom: 0.8em;
288}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]289div.hdlist tr {
290 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]291}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]292dt.hdlist1.strong, td.hdlist1.strong {
293 font-weight: bold;
294}
295td.hdlist1 {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]296 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]297 font-style: normal;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]298 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]299 color: navy;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]300}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]301td.hdlist2 {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]302 vertical-align: top;
303}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]304div.hdlist.compact tr {
305 margin: 0;
306 padding-bottom: 0;
307}
308
309.comment {
310 background: yellow;
311}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]312
313@media print {
314 div#footer-badges { display: none; }
315}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]316
317div#toctitle {
318 color: #527bbd;
319 font-family: sans-serif;
320 font-size: 1.1em;
321 font-weight: bold;
322 margin-top: 1.0em;
323 margin-bottom: 0.1em;
324}
325
326div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
327 margin-top: 0;
328 margin-bottom: 0;
329}
330div.toclevel2 {
331 margin-left: 2em;
332 font-size: 0.9em;
333}
334div.toclevel3 {
335 margin-left: 4em;
336 font-size: 0.9em;
337}
338div.toclevel4 {
339 margin-left: 6em;
340 font-size: 0.9em;
341}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]342/* Overrides for manpage documents */
343h1 {
344 padding-top: 0.5em;
345 padding-bottom: 0.5em;
346 border-top: 2px solid silver;
347 border-bottom: 2px solid silver;
348}
349h2 {
350 border-style: none;
351}
352div.sectionbody {
353 margin-left: 5%;
354}
355
356@media print {
357 div#toc { display: none; }
358}
359
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]360/* Workarounds for IE6's broken and incomplete CSS2. */
361
362div.sidebar-content {
363 background: #ffffee;
364 border: 1px solid silver;
365 padding: 0.5em;
366}
367div.sidebar-title, div.image-title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]368 color: #527bbd;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]369 font-family: sans-serif;
370 font-weight: bold;
371 margin-top: 0.0em;
372 margin-bottom: 0.5em;
373}
374
375div.listingblock div.content {
376 border: 1px solid silver;
377 background: #f4f4f4;
378 padding: 0.5em;
379}
380
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]381div.quoteblock-attribution {
382 padding-top: 0.5em;
383 text-align: right;
384}
385
386div.verseblock-content {
387 white-space: pre;
388}
389div.verseblock-attribution {
390 padding-top: 0.75em;
391 text-align: left;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]392}
393
394div.exampleblock-content {
395 border-left: 2px solid silver;
396 padding-left: 0.5em;
397}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]398
399/* IE6 sets dynamically generated links as visited. */
400div#toc a:visited { color: blue; }
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]401</style>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]402</head>
403<body>
404<div id="header">
405<h1>
406git-config(1) Manual Page
407</h1>
408<h2>NAME</h2>
409<div class="sectionbody">
410<p>git-config -
411 Get and set repository or global options
412</p>
413</div>
414</div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]415<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]416<div class="sectionbody">
417<div class="verseblock">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]418<div class="verseblock-content"><em>git config</em> [&lt;file-option&gt;] [type] [-z|--null] name [value [value_regex]]
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]419<em>git config</em> [&lt;file-option&gt;] [type] --add name value
Junio C Hamano5217a272009-03-21 00:39:33[diff] [blame]420<em>git config</em> [&lt;file-option&gt;] [type] --replace-all name value [value_regex]
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]421<em>git config</em> [&lt;file-option&gt;] [type] [-z|--null] --get name [value_regex]
422<em>git config</em> [&lt;file-option&gt;] [type] [-z|--null] --get-all name [value_regex]
423<em>git config</em> [&lt;file-option&gt;] [type] [-z|--null] --get-regexp name_regex [value_regex]
424<em>git config</em> [&lt;file-option&gt;] --unset name [value_regex]
425<em>git config</em> [&lt;file-option&gt;] --unset-all name [value_regex]
426<em>git config</em> [&lt;file-option&gt;] --rename-section old_name new_name
427<em>git config</em> [&lt;file-option&gt;] --remove-section name
428<em>git config</em> [&lt;file-option&gt;] [-z|--null] -l | --list
429<em>git config</em> [&lt;file-option&gt;] --get-color name [default]
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]430<em>git config</em> [&lt;file-option&gt;] --get-colorbool name [stdout-is-tty]
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]431<em>git config</em> [&lt;file-option&gt;] -e | --edit</div>
432<div class="verseblock-attribution">
433</div></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]434</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]435<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]436<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]437<div class="paragraph"><p>You can query/set/replace/unset options with this command. The name is
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]438actually the section and the key separated by a dot, and the value will be
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]439escaped.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]440<div class="paragraph"><p>Multiple lines can be added to an option by using the <em>--add</em> option.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]441If you want to update or unset an option which can occur on multiple
442lines, a POSIX regexp <tt>value_regex</tt> needs to be given. Only the
443existing values that match the regexp are updated or unset. If
444you want to handle the lines that do <strong>not</strong> match the regex, just
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]445prepend a single exclamation mark in front (see also <a href="#EXAMPLES">[EXAMPLES]</a>).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]446<div class="paragraph"><p>The type specifier can be either <em>--int</em> or <em>--bool</em>, to make
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]447<em>git config</em> ensure that the variable(s) are of the given type and
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]448convert the value to the canonical form (simple decimal number for int,
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]449a "true" or "false" string for bool), or <em>--path</em>, which does some
450path expansion (see <em>--path</em> below). If no type specifier is passed, no
451checks or transformations are performed on the value.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]452<div class="paragraph"><p>The file-option can be one of <em>--system</em>, <em>--global</em> or <em>--file</em>
Junio C Hamano0ddc94d2007-08-01 08:42:39[diff] [blame]453which specify where the values will be read from or written to.
454The default is to assume the config file of the current repository,
455.git/config unless defined otherwise with GIT_DIR and GIT_CONFIG
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]456(see <a href="#FILES">[FILES]</a>).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]457<div class="paragraph"><p>This command will fail if:</p></div>
458<div class="olist arabic"><ol class="arabic">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]459<li>
460<p>
Junio C Hamano0ddc94d2007-08-01 08:42:39[diff] [blame]461The config file is invalid,
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]462</p>
463</li>
464<li>
465<p>
Junio C Hamano0ddc94d2007-08-01 08:42:39[diff] [blame]466Can not write to the config file,
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]467</p>
468</li>
469<li>
470<p>
471no section was provided,
472</p>
473</li>
474<li>
475<p>
476the section or key is invalid,
477</p>
478</li>
479<li>
480<p>
481you try to unset an option which does not exist,
482</p>
483</li>
484<li>
485<p>
486you try to unset/set an option for which multiple lines match, or
487</p>
488</li>
489<li>
490<p>
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]491you use <em>--global</em> option without $HOME being properly set.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]492</p>
493</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]494</ol></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]495</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]496<h2 id="_options">OPTIONS</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]497<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]498<div class="dlist"><dl>
499<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]500--replace-all
501</dt>
502<dd>
503<p>
504 Default behavior is to replace at most one line. This replaces
505 all lines matching the key (and optionally the value_regex).
506</p>
507</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]508<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]509--add
510</dt>
511<dd>
512<p>
513 Adds a new line to the option without altering any existing
Junio C Hamano89bdb3b2009-05-10 06:48:14[diff] [blame]514 values. This is the same as providing <em>^$</em> as the value_regex
515 in <tt>--replace-all</tt>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]516</p>
517</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]518<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]519--get
520</dt>
521<dd>
522<p>
523 Get the value for a given key (optionally filtered by a regex
524 matching the value). Returns error code 1 if the key was not
525 found and error code 2 if multiple key values were found.
526</p>
527</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]528<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]529--get-all
530</dt>
531<dd>
532<p>
533 Like get, but does not fail if the number of values for the key
534 is not exactly one.
535</p>
536</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]537<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]538--get-regexp
539</dt>
540<dd>
541<p>
542 Like --get-all, but interprets the name as a regular expression.
Junio C Hamanoddc5ad42007-06-27 07:14:52[diff] [blame]543 Also outputs the key names.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]544</p>
545</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]546<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]547--global
548</dt>
549<dd>
550<p>
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]551 For writing options: write to global ~/.gitconfig file rather than
552 the repository .git/config.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]553</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]554<div class="paragraph"><p>For reading options: read only from global ~/.gitconfig rather than
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]555from all available files.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]556<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]557</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]558<dt class="hdlist1">
Junio C Hamano81c711d2007-04-20 07:20:14[diff] [blame]559--system
560</dt>
561<dd>
562<p>
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]563 For writing options: write to system-wide $(prefix)/etc/gitconfig
564 rather than the repository .git/config.
Junio C Hamano81c711d2007-04-20 07:20:14[diff] [blame]565</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]566<div class="paragraph"><p>For reading options: read only from system-wide $(prefix)/etc/gitconfig
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]567rather than from all available files.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]568<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div>
Junio C Hamano81c711d2007-04-20 07:20:14[diff] [blame]569</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]570<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]571-f config-file
572</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]573<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]574--file config-file
Junio C Hamano0ddc94d2007-08-01 08:42:39[diff] [blame]575</dt>
576<dd>
577<p>
578 Use the given config file instead of the one specified by GIT_CONFIG.
579</p>
580</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]581<dt class="hdlist1">
Junio C Hamanod15328a2007-03-09 09:06:40[diff] [blame]582--remove-section
583</dt>
584<dd>
585<p>
586 Remove the given section from the configuration file.
587</p>
588</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]589<dt class="hdlist1">
Junio C Hamanod15328a2007-03-09 09:06:40[diff] [blame]590--rename-section
591</dt>
592<dd>
593<p>
594 Rename the given section to a new name.
595</p>
596</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]597<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]598--unset
599</dt>
600<dd>
601<p>
602 Remove the line matching the key from config file.
603</p>
604</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]605<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]606--unset-all
607</dt>
608<dd>
609<p>
Junio C Hamano10557772007-03-15 07:12:30[diff] [blame]610 Remove all lines matching the key from config file.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]611</p>
612</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]613<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]614-l
615</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]616<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]617--list
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]618</dt>
619<dd>
620<p>
621 List all variables set in config file.
622</p>
623</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]624<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]625--bool
626</dt>
627<dd>
628<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]629 <em>git config</em> will ensure that the output is "true" or "false"
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]630</p>
631</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]632<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]633--int
634</dt>
635<dd>
636<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]637 <em>git config</em> will ensure that the output is a simple
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]638 decimal number. An optional value suffix of <em>k</em>, <em>m</em>, or <em>g</em>
639 in the config file will cause the value to be multiplied
640 by 1024, 1048576, or 1073741824 prior to output.
641</p>
642</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]643<dt class="hdlist1">
Junio C Hamano792c5a92009-03-08 08:45:13[diff] [blame]644--bool-or-int
645</dt>
646<dd>
647<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]648 <em>git config</em> will ensure that the output matches the format of
Junio C Hamano792c5a92009-03-08 08:45:13[diff] [blame]649 either --bool or --int, as described above.
650</p>
651</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]652<dt class="hdlist1">
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]653--path
654</dt>
655<dd>
656<p>
657 <em>git-config</em> will expand leading <em>&#126;</em> to the value of
658 <em>$HOME</em>, and <em>&#126;user</em> to the home directory for the
659 specified user. This option has no effect when setting the
660 value (but you can use <em>git config bla &#126;/</em> from the
661 command line to let your shell do the expansion).
662</p>
663</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]664<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]665-z
666</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]667<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]668--null
Junio C Hamanoddc5ad42007-06-27 07:14:52[diff] [blame]669</dt>
670<dd>
671<p>
672 For all options that output values and/or keys, always
Junio C Hamano1f511962008-01-30 08:28:52[diff] [blame]673 end values with the null character (instead of a
Junio C Hamanoddc5ad42007-06-27 07:14:52[diff] [blame]674 newline). Use newline instead as a delimiter between
675 key and value. This allows for secure parsing of the
676 output without getting confused e.g. by values that
677 contain line breaks.
678</p>
679</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]680<dt class="hdlist1">
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]681--get-colorbool name [stdout-is-tty]
682</dt>
683<dd>
684<p>
685 Find the color setting for <tt>name</tt> (e.g. <tt>color.diff</tt>) and output
686 "true" or "false". <tt>stdout-is-tty</tt> should be either "true" or
687 "false", and is taken into account when configuration says
688 "auto". If <tt>stdout-is-tty</tt> is missing, then checks the standard
689 output of the command itself, and exits with status 0 if color
690 is to be used, or exits with status 1 otherwise.
Junio C Hamanoe3ddb5b2008-04-21 00:48:07[diff] [blame]691 When the color setting for <tt>name</tt> is undefined, the command uses
692 <tt>color.ui</tt> as fallback.
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]693</p>
694</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]695<dt class="hdlist1">
Junio C Hamano89bdb3b2009-05-10 06:48:14[diff] [blame]696--get-color name [default]
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]697</dt>
698<dd>
699<p>
700 Find the color configured for <tt>name</tt> (e.g. <tt>color.diff.new</tt>) and
701 output it as the ANSI color escape sequence to the standard
702 output. The optional <tt>default</tt> parameter is used instead, if
703 there is no color configured for <tt>name</tt>.
704</p>
705</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]706<dt class="hdlist1">
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]707-e
708</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]709<dt class="hdlist1">
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]710--edit
711</dt>
712<dd>
713<p>
714 Opens an editor to modify the specified config file; either
715 <em>--system</em>, <em>--global</em>, or repository (default).
716</p>
717</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]718</dl></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]719</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]720<h2 id="FILES">FILES</h2>
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]721<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]722<div class="paragraph"><p>If not set explicitly with <em>--file</em>, there are three files where
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]723<em>git config</em> will search for configuration options:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]724<div class="dlist"><dl>
725<dt class="hdlist1">
Junio C Hamano58155b42007-09-15 07:46:14[diff] [blame]726$GIT_DIR/config
727</dt>
728<dd>
729<p>
730 Repository specific configuration file. (The filename is
731 of course relative to the repository root, not the working
732 directory.)
733</p>
734</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]735<dt class="hdlist1">
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]736~/.gitconfig
737</dt>
738<dd>
739<p>
740 User-specific configuration file. Also called "global"
741 configuration file.
742</p>
743</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]744<dt class="hdlist1">
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]745$(prefix)/etc/gitconfig
746</dt>
747<dd>
748<p>
749 System-wide configuration file.
750</p>
751</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]752</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]753<div class="paragraph"><p>If no further options are given, all reading options will read all of these
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]754files that are available. If the global or the system-wide configuration
755file are not available they will be ignored. If the repository configuration
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]756file is not available or readable, <em>git config</em> will exit with a non-zero
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]757error code. However, in neither case will an error message be issued.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]758<div class="paragraph"><p>All writing options will per default write to the repository specific
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]759configuration file. Note that this also affects options like <em>--replace-all</em>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]760and <em>--unset</em>. <strong><em>git config</em> will only ever change one file at a time</strong>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]761<div class="paragraph"><p>You can override these rules either by command line options or by environment
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]762variables. The <em>--global</em> and the <em>--system</em> options will limit the file used
763to the global or system-wide file respectively. The GIT_CONFIG environment
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]764variable has a similar effect, but you can specify any filename you want.</p></div>
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]765</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]766<h2 id="_environment">ENVIRONMENT</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]767<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]768<div class="dlist"><dl>
769<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]770GIT_CONFIG
771</dt>
772<dd>
773<p>
774 Take the configuration from the given file instead of .git/config.
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]775 Using the "--global" option forces this to ~/.gitconfig. Using the
776 "--system" option forces this to $(prefix)/etc/gitconfig.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]777</p>
778</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]779</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]780<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]781</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]782<h2 id="EXAMPLES">EXAMPLES</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]783<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]784<div class="paragraph"><p>Given a .git/config like this:</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]785<div class="literalblock">
786<div class="content">
787<pre><tt>#
788# This is the config file, and
789# a '#' or ';' character indicates
790# a comment
791#</tt></pre>
792</div></div>
793<div class="literalblock">
794<div class="content">
795<pre><tt>; core variables
796[core]
797 ; Don't trust file modes
798 filemode = false</tt></pre>
799</div></div>
800<div class="literalblock">
801<div class="content">
802<pre><tt>; Our diff algorithm
803[diff]
Junio C Hamano85c71572008-07-28 00:03:31[diff] [blame]804 external = /usr/local/bin/diff-wrapper
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]805 renames = true</tt></pre>
806</div></div>
807<div class="literalblock">
808<div class="content">
809<pre><tt>; Proxy settings
810[core]
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]811 gitproxy="proxy-command" for kernel.org
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]812 gitproxy=default-proxy ; for all the rest</tt></pre>
813</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]814<div class="paragraph"><p>you can set the filemode to true with</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]815<div class="listingblock">
816<div class="content">
817<pre><tt>% git config core.filemode true</tt></pre>
818</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]819<div class="paragraph"><p>The hypothetical proxy command entries actually have a postfix to discern
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]820what URL they apply to. Here is how to change the entry for kernel.org
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]821to "ssh".</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]822<div class="listingblock">
823<div class="content">
824<pre><tt>% git config core.gitproxy '"ssh" for kernel.org' 'for kernel.org$'</tt></pre>
825</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]826<div class="paragraph"><p>This makes sure that only the key/value pair for kernel.org is replaced.</p></div>
827<div class="paragraph"><p>To delete the entry for renames, do</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]828<div class="listingblock">
829<div class="content">
830<pre><tt>% git config --unset diff.renames</tt></pre>
831</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]832<div class="paragraph"><p>If you want to delete an entry for a multivar (like core.gitproxy above),
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]833you have to provide a regex matching the value of exactly one line.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]834<div class="paragraph"><p>To query the value for a given key, do</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]835<div class="listingblock">
836<div class="content">
837<pre><tt>% git config --get core.filemode</tt></pre>
838</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]839<div class="paragraph"><p>or</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]840<div class="listingblock">
841<div class="content">
842<pre><tt>% git config core.filemode</tt></pre>
843</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]844<div class="paragraph"><p>or, to query a multivar:</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]845<div class="listingblock">
846<div class="content">
847<pre><tt>% git config --get core.gitproxy "for kernel.org$"</tt></pre>
848</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]849<div class="paragraph"><p>If you want to know all the values for a multivar, do:</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]850<div class="listingblock">
851<div class="content">
852<pre><tt>% git config --get-all core.gitproxy</tt></pre>
853</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]854<div class="paragraph"><p>If you like to live dangerously, you can replace <strong>all</strong> core.gitproxy by a
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]855new one with</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]856<div class="listingblock">
857<div class="content">
858<pre><tt>% git config --replace-all core.gitproxy ssh</tt></pre>
859</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]860<div class="paragraph"><p>However, if you really only want to replace the line for the default proxy,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]861i.e. the one without a "for &#8230;" postfix, do something like this:</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]862<div class="listingblock">
863<div class="content">
864<pre><tt>% git config core.gitproxy ssh '! for '</tt></pre>
865</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]866<div class="paragraph"><p>To actually match only values with an exclamation mark, you have to</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]867<div class="listingblock">
868<div class="content">
869<pre><tt>% git config section.key value '[!]'</tt></pre>
870</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]871<div class="paragraph"><p>To add a new proxy, without altering any of the existing ones, use</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]872<div class="listingblock">
873<div class="content">
Junio C Hamanoc71a8732007-08-04 00:27:26[diff] [blame]874<pre><tt>% git config core.gitproxy '"proxy-command" for example.com'</tt></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]875</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]876<div class="paragraph"><p>An example to use customized color from the configuration in your
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]877script:</p></div>
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]878<div class="listingblock">
879<div class="content">
880<pre><tt>#!/bin/sh
881WS=$(git config --get-color color.diff.whitespace "blue reverse")
882RESET=$(git config --get-color "" "reset")
883echo "${WS}your whitespace color or blue reverse${RESET}"</tt></pre>
884</div></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]885</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]886<h2 id="_configuration_file">CONFIGURATION FILE</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]887<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]888<div class="paragraph"><p>The git configuration file contains a number of variables that affect
889the git command&#8217;s behavior. The <tt>.git/config</tt> file in each repository
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]890is used to store the configuration for that repository, and
891<tt>$HOME/.gitconfig</tt> is used to store a per-user configuration as
892fallback values for the <tt>.git/config</tt> file. The file <tt>/etc/gitconfig</tt>
893can be used to store a system-wide default configuration.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]894<div class="paragraph"><p>The configuration variables are used by both the git plumbing
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]895and the porcelains. The variables are divided into sections, wherein
896the fully qualified variable name of the variable itself is the last
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]897dot-separated segment and the section name is everything before the last
898dot. The variable names are case-insensitive and only alphanumeric
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]899characters are allowed. Some variables may appear multiple times.</p></div>
900<h3 id="_syntax">Syntax</h3><div style="clear:left"></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]901<div class="paragraph"><p>The syntax is fairly flexible and permissive; whitespaces are mostly
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]902ignored. The <em>#</em> and <em>;</em> characters begin comments to the end of line,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]903blank lines are ignored.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]904<div class="paragraph"><p>The file consists of sections and variables. A section begins with
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]905the name of the section in square brackets and continues until the next
906section begins. Section names are not case sensitive. Only alphanumeric
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame]907characters, <tt>-</tt> and <tt>.</tt> are allowed in section names. Each variable
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]908must belong to some section, which means that there must be a section
909header before the first setting of a variable.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]910<div class="paragraph"><p>Sections can be further divided into subsections. To begin a subsection
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]911put its name in double quotes, separated by space from the section name,
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]912in the section header, like in the example below:</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]913<div class="listingblock">
914<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]915<pre><tt> [section "subsection"]</tt></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]916</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]917<div class="paragraph"><p>Subsection names are case sensitive and can contain any characters except
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]918newline (doublequote <tt>"</tt> and backslash have to be escaped as <tt>\"</tt> and <tt>\\</tt>,
919respectively). Section headers cannot span multiple
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]920lines. Variables may belong directly to a section or to a given subsection.
921You can have <tt>[section]</tt> if you have <tt>[section "subsection"]</tt>, but you
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]922don&#8217;t need to.</p></div>
923<div class="paragraph"><p>There is also a case insensitive alternative <tt>[section.subsection]</tt> syntax.
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]924In this syntax, subsection names follow the same restrictions as for section
925names.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]926<div class="paragraph"><p>All the other lines (and the remainder of the line after the section
Junio C Hamanoaa2cd762009-07-26 08:14:01[diff] [blame]927header) are recognized as setting variables, in the form
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]928<em>name = value</em>. If there is no equal sign on the line, the entire line
929is taken as <em>name</em> and the variable is recognized as boolean "true".
930The variable names are case-insensitive and only alphanumeric
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame]931characters and <tt>-</tt> are allowed. There can be more than one value
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]932for a given variable; we say then that variable is multivalued.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]933<div class="paragraph"><p>Leading and trailing whitespace in a variable value is discarded.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]934Internal whitespace within a variable value is retained verbatim.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]935<div class="paragraph"><p>The values following the equals sign in variable assign are all either
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]936a string, an integer, or a boolean. Boolean values may be given as yes/no,
Junio C Hamano059bca52011-03-30 22:47:46[diff] [blame^]9371/0, true/false or on/off. Case is not significant in boolean values, when
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]938converting value to the canonical form using <em>--bool</em> type specifier;
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]939<em>git config</em> will ensure that the output is "true" or "false".</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]940<div class="paragraph"><p>String values may be entirely or partially enclosed in double quotes.
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]941You need to enclose variable values in double quotes if you want to
942preserve leading or trailing whitespace, or if the variable value contains
943comment characters (i.e. it contains <em>#</em> or <em>;</em>).
944Double quote <tt>"</tt> and backslash <tt>\</tt> characters in variable values must
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame]945be escaped: use <tt>\"</tt> for <tt>"</tt> and <tt>\\</tt> for <tt>\</tt>.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]946<div class="paragraph"><p>The following escape sequences (beside <tt>\"</tt> and <tt>\\</tt>) are recognized:
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame]947<tt>\n</tt> for newline character (NL), <tt>\t</tt> for horizontal tabulation (HT, TAB)
948and <tt>\b</tt> for backspace (BS). No other char escape sequence, nor octal
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]949char sequences are valid.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]950<div class="paragraph"><p>Variable values ending in a <tt>\</tt> are continued on the next line in the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]951customary UNIX fashion.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]952<div class="paragraph"><p>Some variables may require a special value format.</p></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]953<h3 id="_example">Example</h3><div style="clear:left"></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]954<div class="literalblock">
955<div class="content">
956<pre><tt># Core variables
957[core]
958 ; Don't trust file modes
959 filemode = false</tt></pre>
960</div></div>
961<div class="literalblock">
962<div class="content">
963<pre><tt># Our diff algorithm
964[diff]
Junio C Hamano85c71572008-07-28 00:03:31[diff] [blame]965 external = /usr/local/bin/diff-wrapper
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]966 renames = true</tt></pre>
967</div></div>
968<div class="literalblock">
969<div class="content">
970<pre><tt>[branch "devel"]
971 remote = origin
972 merge = refs/heads/devel</tt></pre>
973</div></div>
974<div class="literalblock">
975<div class="content">
976<pre><tt># Proxy settings
977[core]
Junio C Hamanoc71a8732007-08-04 00:27:26[diff] [blame]978 gitProxy="ssh" for "kernel.org"
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]979 gitProxy=default-proxy ; for the rest</tt></pre>
980</div></div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]981<h3 id="_variables">Variables</h3><div style="clear:left"></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]982<div class="paragraph"><p>Note that this list is non-comprehensive and not necessarily complete.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]983For command-specific variables, you will find a more detailed description
984in the appropriate manual page. You will find a description of non-core
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]985porcelain configuration variables in the respective porcelain documentation.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]986<div class="dlist"><dl>
987<dt class="hdlist1">
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]988advice.*
989</dt>
990<dd>
991<p>
992 When set to <em>true</em>, display the given optional help message.
993 When set to <em>false</em>, do not display. The configuration variables
994 are:
995</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]996<div class="dlist"><dl>
997<dt class="hdlist1">
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]998pushNonFastForward
999</dt>
1000<dd>
1001<p>
1002 Advice shown when <a href="git-push.html">git-push(1)</a> refuses
1003 non-fast-forward refs. Default: true.
1004</p>
1005</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1006<dt class="hdlist1">
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1007statusHints
1008</dt>
1009<dd>
1010<p>
1011 Directions on how to stage/unstage/add shown in the
1012 output of <a href="git-status.html">git-status(1)</a> and the template shown
1013 when writing commit messages. Default: true.
1014</p>
1015</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1016<dt class="hdlist1">
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]1017commitBeforeMerge
1018</dt>
1019<dd>
1020<p>
1021 Advice shown when <a href="git-merge.html">git-merge(1)</a> refuses to
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1022 merge to avoid overwriting local changes.
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]1023 Default: true.
1024</p>
1025</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1026<dt class="hdlist1">
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]1027resolveConflict
1028</dt>
1029<dd>
1030<p>
1031 Advices shown by various commands when conflicts
1032 prevent the operation from being performed.
1033 Default: true.
1034</p>
1035</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1036<dt class="hdlist1">
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]1037implicitIdentity
1038</dt>
1039<dd>
1040<p>
1041 Advice on how to set your identity configuration when
1042 your information is guessed from the system username and
1043 domain name. Default: true.
1044</p>
1045</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1046<dt class="hdlist1">
Junio C Hamano74a198f2010-02-22 00:13:31[diff] [blame]1047detachedHead
1048</dt>
1049<dd>
1050<p>
1051 Advice shown when you used <a href=":git-checkout.html">:git-checkout(1)</a> to
1052 move to the detach HEAD state, to instruct how to create
1053 a local branch after the fact. Default: true.
1054</p>
1055</dd>
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1056</dl></div>
1057</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1058<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1059core.fileMode
1060</dt>
1061<dd>
1062<p>
1063 If false, the executable bit differences between the index and
1064 the working copy are ignored; useful on broken filesystems like FAT.
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1065 See <a href="git-update-index.html">git-update-index(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1066</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1067<div class="paragraph"><p>The default is true, except <a href="git-clone.html">git-clone(1)</a> or <a href="git-init.html">git-init(1)</a>
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1068will probe and set core.fileMode false if appropriate when the
1069repository is created.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1070</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1071<dt class="hdlist1">
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1072core.ignoreCygwinFSTricks
1073</dt>
1074<dd>
1075<p>
1076 This option is only used by Cygwin implementation of Git. If false,
1077 the Cygwin stat() and lstat() functions are used. This may be useful
1078 if your repository consists of a few separate directories joined in
1079 one hierarchy using Cygwin mount. If true, Git uses native Win32 API
1080 whenever it is possible and falls back to Cygwin functions only to
1081 handle symbol links. The native mode is more than twice faster than
Junio C Hamano7d06a8a2008-10-20 05:42:33[diff] [blame]1082 normal Cygwin l/stat() functions. True by default, unless core.filemode
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1083 is true, in which case ignoreCygwinFSTricks is ignored as Cygwin&#8217;s
Junio C Hamano7d06a8a2008-10-20 05:42:33[diff] [blame]1084 POSIX emulation is required to support core.filemode.
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1085</p>
1086</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1087<dt class="hdlist1">
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1088core.ignorecase
1089</dt>
1090<dd>
1091<p>
1092 If true, this option enables various workarounds to enable
1093 git to work better on filesystems that are not case sensitive,
1094 like FAT. For example, if a directory listing finds
1095 "makefile" when git expects "Makefile", git will assume
1096 it is really the same file, and continue to remember it as
1097 "Makefile".
1098</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1099<div class="paragraph"><p>The default is false, except <a href="git-clone.html">git-clone(1)</a> or <a href="git-init.html">git-init(1)</a>
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1100will probe and set core.ignorecase true if appropriate when the repository
1101is created.</p></div>
1102</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1103<dt class="hdlist1">
Junio C Hamano90ccff32008-07-29 08:17:24[diff] [blame]1104core.trustctime
1105</dt>
1106<dd>
1107<p>
1108 If false, the ctime differences between the index and the
1109 working copy are ignored; useful when the inode change time
1110 is regularly modified by something outside Git (file system
1111 crawlers and some backup systems).
1112 See <a href="git-update-index.html">git-update-index(1)</a>. True by default.
1113</p>
1114</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1115<dt class="hdlist1">
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1116core.quotepath
1117</dt>
1118<dd>
1119<p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1120 The commands that output paths (e.g. <em>ls-files</em>,
1121 <em>diff</em>), when not given the <tt>-z</tt> option, will quote
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1122 "unusual" characters in the pathname by enclosing the
1123 pathname in a double-quote pair and with backslashes the
1124 same way strings in C source code are quoted. If this
1125 variable is set to false, the bytes higher than 0x80 are
1126 not quoted but output as verbatim. Note that double
1127 quote, backslash and control characters are always
1128 quoted without <tt>-z</tt> regardless of the setting of this
1129 variable.
1130</p>
1131</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1132<dt class="hdlist1">
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1133core.eol
Junio C Hamanod9e0e5d2007-04-14 16:22:04[diff] [blame]1134</dt>
1135<dd>
1136<p>
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1137 Sets the line ending type to use in the working directory for
1138 files that have the <tt>text</tt> property set. Alternatives are
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1139 <em>lf</em>, <em>crlf</em> and <em>native</em>, which uses the platform&#8217;s native
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1140 line ending. The default value is <tt>native</tt>. See
1141 <a href="gitattributes.html">gitattributes(5)</a> for more information on end-of-line
1142 conversion.
Junio C Hamanod9e0e5d2007-04-14 16:22:04[diff] [blame]1143</p>
1144</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1145<dt class="hdlist1">
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1146core.safecrlf
1147</dt>
1148<dd>
1149<p>
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1150 If true, makes git check if converting <tt>CRLF</tt> is reversible when
1151 end-of-line conversion is active. Git will verify if a command
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1152 modifies a file in the work tree either directly or indirectly.
1153 For example, committing a file followed by checking out the
1154 same file should yield the original file in the work tree. If
1155 this is not the case for the current setting of
1156 <tt>core.autocrlf</tt>, git will reject the file. The variable can
1157 be set to "warn", in which case git will only warn about an
1158 irreversible conversion but continue the operation.
1159</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1160<div class="paragraph"><p>CRLF conversion bears a slight chance of corrupting data.
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1161When it is enabled, git will convert CRLF to LF during commit and LF to
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1162CRLF during checkout. A file that contains a mixture of LF and
1163CRLF before the commit cannot be recreated by git. For text
1164files this is the right thing to do: it corrects line endings
1165such that we have only LF line endings in the repository.
1166But for binary files that are accidentally classified as text the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1167conversion can corrupt data.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1168<div class="paragraph"><p>If you recognize such corruption early you can easily fix it by
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1169setting the conversion type explicitly in .gitattributes. Right
1170after committing you still have the original file in your work
1171tree and this file is not yet corrupted. You can explicitly tell
1172git that this file is binary and git will handle the file
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1173appropriately.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1174<div class="paragraph"><p>Unfortunately, the desired effect of cleaning up text files with
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1175mixed line endings and the undesired effect of corrupting binary
1176files cannot be distinguished. In both cases CRLFs are removed
1177in an irreversible way. For text files this is the right thing
1178to do because CRLFs are line endings, while for binary files
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1179converting CRLFs corrupts data.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1180<div class="paragraph"><p>Note, this safety check does not mean that a checkout will generate a
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1181file identical to the original file for a different setting of
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1182<tt>core.eol</tt> and <tt>core.autocrlf</tt>, but only for the current one. For
1183example, a text file with <tt>LF</tt> would be accepted with <tt>core.eol=lf</tt>
1184and could later be checked out with <tt>core.eol=crlf</tt>, in which case the
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1185resulting file would contain <tt>CRLF</tt>, although the original file
1186contained <tt>LF</tt>. However, in both work trees the line endings would be
1187consistent, that is either all <tt>LF</tt> or all <tt>CRLF</tt>, but never mixed. A
1188file with mixed line endings would be reported by the <tt>core.safecrlf</tt>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1189mechanism.</p></div>
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1190</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1191<dt class="hdlist1">
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1192core.autocrlf
1193</dt>
1194<dd>
1195<p>
1196 Setting this variable to "true" is almost the same as setting
1197 the <tt>text</tt> attribute to "auto" on all files except that text
1198 files are not guaranteed to be normalized: files that contain
1199 <tt>CRLF</tt> in the repository will not be touched. Use this
1200 setting if you want to have <tt>CRLF</tt> line endings in your
1201 working directory even though the repository does not have
1202 normalized line endings. This variable can be set to <em>input</em>,
1203 in which case no output conversion is performed.
1204</p>
1205</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1206<dt class="hdlist1">
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]1207core.symlinks
1208</dt>
1209<dd>
1210<p>
1211 If false, symbolic links are checked out as small plain files that
1212 contain the link text. <a href="git-update-index.html">git-update-index(1)</a> and
1213 <a href="git-add.html">git-add(1)</a> will not change the recorded type to regular
1214 file. Useful on filesystems like FAT that do not support
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1215 symbolic links.
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]1216</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1217<div class="paragraph"><p>The default is true, except <a href="git-clone.html">git-clone(1)</a> or <a href="git-init.html">git-init(1)</a>
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1218will probe and set core.symlinks false if appropriate when the repository
1219is created.</p></div>
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]1220</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1221<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1222core.gitProxy
1223</dt>
1224<dd>
1225<p>
1226 A "proxy command" to execute (as <em>command host port</em>) instead
1227 of establishing direct connection to the remote server when
1228 using the git protocol for fetching. If the variable value is
1229 in the "COMMAND for DOMAIN" format, the command is applied only
1230 on hostnames ending with the specified domain string. This variable
1231 may be set multiple times and is matched in the given order;
1232 the first match wins.
1233</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1234<div class="paragraph"><p>Can be overridden by the <em>GIT_PROXY_COMMAND</em> environment variable
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1235(which always applies universally, without the special "for"
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1236handling).</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1237<div class="paragraph"><p>The special string <tt>none</tt> can be used as the proxy command to
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame]1238specify that no proxy be used for a given domain pattern.
1239This is useful for excluding servers inside a firewall from
1240proxy use, while defaulting to a common proxy for external domains.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1241</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1242<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1243core.ignoreStat
1244</dt>
1245<dd>
1246<p>
Junio C Hamano054ea082008-06-01 08:26:34[diff] [blame]1247 If true, commands which modify both the working tree and the index
1248 will mark the updated paths with the "assume unchanged" bit in the
1249 index. These marked files are then assumed to stay unchanged in the
1250 working copy, until you mark them otherwise manually - Git will not
1251 detect the file changes by lstat() calls. This is useful on systems
1252 where those are very slow, such as Microsoft Windows.
1253 See <a href="git-update-index.html">git-update-index(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1254 False by default.
1255</p>
1256</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1257<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1258core.preferSymlinkRefs
1259</dt>
1260<dd>
1261<p>
1262 Instead of the default "symref" format for HEAD
1263 and other symbolic reference files, use symbolic links.
1264 This is sometimes needed to work with old scripts that
1265 expect HEAD to be a symbolic link.
1266</p>
1267</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1268<dt class="hdlist1">
Junio C Hamano1025e752007-02-23 07:21:26[diff] [blame]1269core.bare
1270</dt>
1271<dd>
1272<p>
1273 If true this repository is assumed to be <em>bare</em> and has no
1274 working directory associated with it. If this is the case a
1275 number of commands that require a working directory will be
1276 disabled, such as <a href="git-add.html">git-add(1)</a> or <a href="git-merge.html">git-merge(1)</a>.
1277</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1278<div class="paragraph"><p>This setting is automatically guessed by <a href="git-clone.html">git-clone(1)</a> or
Junio C Hamano1025e752007-02-23 07:21:26[diff] [blame]1279<a href="git-init.html">git-init(1)</a> when the repository was created. By default a
1280repository that ends in "/.git" is assumed to be not bare (bare =
1281false), while all other repositories are assumed to be bare (bare
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1282= true).</p></div>
Junio C Hamano1025e752007-02-23 07:21:26[diff] [blame]1283</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1284<dt class="hdlist1">
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1285core.worktree
1286</dt>
1287<dd>
1288<p>
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1289 Set the path to the root of the working tree.
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]1290 This can be overridden by the GIT_WORK_TREE environment
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1291 variable and the <em>--work-tree</em> command line option.
1292 The value can an absolute path or relative to the path to
1293 the .git directory, which is either specified by --git-dir
1294 or GIT_DIR, or automatically discovered.
1295 If --git-dir or GIT_DIR is specified but none of
Junio C Hamano7d575a52008-04-30 08:45:27[diff] [blame]1296 --work-tree, GIT_WORK_TREE and core.worktree is specified,
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1297 the current working directory is regarded as the top level
Junio C Hamano3609b332010-12-29 01:34:52[diff] [blame]1298 of your working tree.
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1299</p>
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1300<div class="paragraph"><p>Note that this variable is honored even when set in a configuration
1301file in a ".git" subdirectory of a directory and its value differs
1302from the latter directory (e.g. "/path/to/.git/config" has
1303core.worktree set to "/different/path"), which is most likely a
1304misconfiguration. Running git commands in the "/path/to" directory will
1305still use "/different/path" as the root of the work tree and can cause
1306confusion unless you know what you are doing (e.g. you are creating a
1307read-only snapshot of the same index to a location different from the
1308repository&#8217;s usual working tree).</p></div>
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1309</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1310<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1311core.logAllRefUpdates
1312</dt>
1313<dd>
1314<p>
Junio C Hamanocae86272007-08-21 02:20:49[diff] [blame]1315 Enable the reflog. Updates to a ref &lt;ref&gt; is logged to the file
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1316 "$GIT_DIR/logs/&lt;ref&gt;", by appending the new and old
1317 SHA1, the date/time and the reason of the update, but
1318 only when the file exists. If this configuration
1319 variable is set to true, missing "$GIT_DIR/logs/&lt;ref&gt;"
1320 file is automatically created for branch heads.
1321</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1322<div class="paragraph"><p>This information can be used to determine what commit
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1323was the tip of a branch "2 days ago".</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1324<div class="paragraph"><p>This value is true by default in a repository that has
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1325a working directory associated with it, and false by
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1326default in a bare repository.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1327</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1328<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1329core.repositoryFormatVersion
1330</dt>
1331<dd>
1332<p>
1333 Internal variable identifying the repository format and layout
1334 version.
1335</p>
1336</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1337<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1338core.sharedRepository
1339</dt>
1340<dd>
1341<p>
1342 When <em>group</em> (or <em>true</em>), the repository is made shareable between
1343 several users in a group (making sure all the files and objects are
1344 group-writable). When <em>all</em> (or <em>world</em> or <em>everybody</em>), the
1345 repository will be readable by all users, additionally to being
1346 group-shareable. When <em>umask</em> (or <em>false</em>), git will use permissions
Junio C Hamano2f102bb2008-04-26 02:23:37[diff] [blame]1347 reported by umask(2). When <em>0xxx</em>, where <em>0xxx</em> is an octal number,
1348 files in the repository will have this mode value. <em>0xxx</em> will override
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1349 user&#8217;s umask value (whereas the other options will only override
1350 requested parts of the user&#8217;s umask value). Examples: <em>0660</em> will make
Junio C Hamano83eded12009-04-20 08:18:00[diff] [blame]1351 the repo read/write-able for the owner and group, but inaccessible to
1352 others (equivalent to <em>group</em> unless umask is e.g. <em>0022</em>). <em>0640</em> is a
Junio C Hamano2f102bb2008-04-26 02:23:37[diff] [blame]1353 repository that is group-readable but not group-writable.
1354 See <a href="git-init.html">git-init(1)</a>. False by default.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1355</p>
1356</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1357<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1358core.warnAmbiguousRefs
1359</dt>
1360<dd>
1361<p>
1362 If true, git will warn you if the ref name you passed it is ambiguous
1363 and might match multiple refs in the .git/refs/ tree. True by default.
1364</p>
1365</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1366<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1367core.compression
1368</dt>
1369<dd>
1370<p>
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]1371 An integer -1..9, indicating a default compression level.
1372 -1 is the zlib default. 0 means no compression,
1373 and 1..9 are various speed/size tradeoffs, 9 being slowest.
Junio C Hamano2e72a942007-11-21 08:54:42[diff] [blame]1374 If set, this provides a default to other compression variables,
1375 such as <em>core.loosecompression</em> and <em>pack.compression</em>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1376</p>
1377</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1378<dt class="hdlist1">
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]1379core.loosecompression
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1380</dt>
1381<dd>
1382<p>
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]1383 An integer -1..9, indicating the compression level for objects that
1384 are not in a pack file. -1 is the zlib default. 0 means no
1385 compression, and 1..9 are various speed/size tradeoffs, 9 being
1386 slowest. If not set, defaults to core.compression. If that is
Junio C Hamano2e72a942007-11-21 08:54:42[diff] [blame]1387 not set, defaults to 1 (best speed).
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1388</p>
1389</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1390<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1391core.packedGitWindowSize
1392</dt>
1393<dd>
1394<p>
1395 Number of bytes of a pack file to map into memory in a
1396 single mapping operation. Larger window sizes may allow
1397 your system to process a smaller number of large pack files
1398 more quickly. Smaller window sizes will negatively affect
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1399 performance due to increased calls to the operating system&#8217;s
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1400 memory manager, but may improve performance when accessing
1401 a large number of large pack files.
1402</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1403<div class="paragraph"><p>Default is 1 MiB if NO_MMAP was set at compile time, otherwise 32
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1404MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should
1405be reasonable for all users/operating systems. You probably do
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1406not need to adjust this value.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1407<div class="paragraph"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1408</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1409<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1410core.packedGitLimit
1411</dt>
1412<dd>
1413<p>
1414 Maximum number of bytes to map simultaneously into memory
1415 from pack files. If Git needs to access more than this many
1416 bytes at once to complete an operation it will unmap existing
1417 regions to reclaim virtual address space within the process.
1418</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1419<div class="paragraph"><p>Default is 256 MiB on 32 bit platforms and 8 GiB on 64 bit platforms.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1420This should be reasonable for all users/operating systems, except on
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1421the largest projects. You probably do not need to adjust this value.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1422<div class="paragraph"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1423</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1424<dt class="hdlist1">
Junio C Hamanob8c51282007-03-19 10:43:30[diff] [blame]1425core.deltaBaseCacheLimit
1426</dt>
1427<dd>
1428<p>
1429 Maximum number of bytes to reserve for caching base objects
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1430 that may be referenced by multiple deltified objects. By storing the
Junio C Hamanob8c51282007-03-19 10:43:30[diff] [blame]1431 entire decompressed base objects in a cache Git is able
1432 to avoid unpacking and decompressing frequently used base
1433 objects multiple times.
1434</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1435<div class="paragraph"><p>Default is 16 MiB on all platforms. This should be reasonable
Junio C Hamanob8c51282007-03-19 10:43:30[diff] [blame]1436for all users/operating systems, except on the largest projects.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1437You probably do not need to adjust this value.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1438<div class="paragraph"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div>
Junio C Hamanob8c51282007-03-19 10:43:30[diff] [blame]1439</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1440<dt class="hdlist1">
Junio C Hamano5c246f22010-02-03 07:34:53[diff] [blame]1441core.bigFileThreshold
1442</dt>
1443<dd>
1444<p>
1445 Files larger than this size are stored deflated, without
1446 attempting delta compression. Storing large files without
1447 delta compression avoids excessive memory usage, at the
1448 slight expense of increased disk usage.
1449</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1450<div class="paragraph"><p>Default is 512 MiB on all platforms. This should be reasonable
Junio C Hamano5c246f22010-02-03 07:34:53[diff] [blame]1451for most projects as source code and other text files can still
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1452be delta compressed, but larger binary media files won&#8217;t be.</p></div>
1453<div class="paragraph"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div>
1454<div class="paragraph"><p>Currently only <a href="git-fast-import.html">git-fast-import(1)</a> honors this setting.</p></div>
Junio C Hamano5c246f22010-02-03 07:34:53[diff] [blame]1455</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1456<dt class="hdlist1">
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]1457core.excludesfile
Junio C Hamano5e284b42007-05-22 07:23:37[diff] [blame]1458</dt>
1459<dd>
1460<p>
1461 In addition to <em>.gitignore</em> (per-directory) and
1462 <em>.git/info/exclude</em>, git looks into this file for patterns
Junio C Hamanobf984de2009-11-23 06:11:19[diff] [blame]1463 of files which are not meant to be tracked. "&#126;/" is expanded
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1464 to the value of <tt>$HOME</tt> and "&#126;user/" to the specified user&#8217;s
Junio C Hamanobf984de2009-11-23 06:11:19[diff] [blame]1465 home directory. See <a href="gitignore.html">gitignore(5)</a>.
Junio C Hamano5e284b42007-05-22 07:23:37[diff] [blame]1466</p>
1467</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1468<dt class="hdlist1">
Junio C Hamano3fd7b262010-09-08 22:44:20[diff] [blame]1469core.askpass
1470</dt>
1471<dd>
1472<p>
1473 Some commands (e.g. svn and http interfaces) that interactively
1474 ask for a password can be told to use an external program given
1475 via the value of this variable. Can be overridden by the <em>GIT_ASKPASS</em>
1476 environment variable. If not set, fall back to the value of the
1477 <em>SSH_ASKPASS</em> environment variable or, failing that, a simple password
1478 prompt. The external program shall be given a suitable prompt as
1479 command line argument and write the password on its STDOUT.
1480</p>
1481</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1482<dt class="hdlist1">
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]1483core.attributesfile
1484</dt>
1485<dd>
1486<p>
1487 In addition to <em>.gitattributes</em> (per-directory) and
1488 <em>.git/info/attributes</em>, git looks into this file for attributes
1489 (see <a href="gitattributes.html">gitattributes(5)</a>). Path expansions are made the same
1490 way as for <tt>core.excludesfile</tt>.
1491</p>
1492</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1493<dt class="hdlist1">
Junio C Hamanof6002a92007-07-20 10:28:22[diff] [blame]1494core.editor
1495</dt>
1496<dd>
1497<p>
1498 Commands such as <tt>commit</tt> and <tt>tag</tt> that lets you edit
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]1499 messages by launching an editor uses the value of this
Junio C Hamanof6002a92007-07-20 10:28:22[diff] [blame]1500 variable when it is set, and the environment variable
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]1501 <tt>GIT_EDITOR</tt> is not set. See <a href="git-var.html">git-var(1)</a>.
Junio C Hamanof6002a92007-07-20 10:28:22[diff] [blame]1502</p>
1503</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1504<dt class="hdlist1">
Junio C Hamano28d8ede2007-07-05 05:51:38[diff] [blame]1505core.pager
1506</dt>
1507<dd>
1508<p>
Junio C Hamano0551f6a2008-08-25 00:33:33[diff] [blame]1509 The command that git will use to paginate output. Can
1510 be overridden with the <tt>GIT_PAGER</tt> environment
1511 variable. Note that git sets the <tt>LESS</tt> environment
1512 variable to <tt>FRSX</tt> if it is unset when it runs the
1513 pager. One can change these settings by setting the
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1514 <tt>LESS</tt> variable to some other value. Alternately,
1515 these settings can be overridden on a project or
1516 global basis by setting the <tt>core.pager</tt> option.
1517 Setting <tt>core.pager</tt> has no affect on the <tt>LESS</tt>
1518 environment variable behaviour above, so if you want
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1519 to override git&#8217;s default settings this way, you need
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1520 to be explicit. For example, to disable the S option
1521 in a backward compatible manner, set <tt>core.pager</tt>
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame]1522 to <tt>less -+$LESS -FRX</tt>. This will be passed to the
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1523 shell by git, which will translate the final command to
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame]1524 <tt>LESS=FRSX less -+FRSX -FRX</tt>.
Junio C Hamano28d8ede2007-07-05 05:51:38[diff] [blame]1525</p>
1526</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1527<dt class="hdlist1">
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]1528core.whitespace
1529</dt>
1530<dd>
1531<p>
1532 A comma separated list of common whitespace problems to
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1533 notice. <em>git diff</em> will use <tt>color.diff.whitespace</tt> to
1534 highlight them, and <em>git apply --whitespace=error</em> will
Junio C Hamano3db8b412008-07-26 06:45:59[diff] [blame]1535 consider them as errors. You can prefix <tt>-</tt> to disable
1536 any of them (e.g. <tt>-trailing-space</tt>):
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]1537</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1538<div class="ulist"><ul>
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]1539<li>
1540<p>
Junio C Hamanob71a22d2009-10-17 08:23:47[diff] [blame]1541<tt>blank-at-eol</tt> treats trailing whitespaces at the end of the line
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]1542 as an error (enabled by default).
1543</p>
1544</li>
1545<li>
1546<p>
1547<tt>space-before-tab</tt> treats a space character that appears immediately
1548 before a tab character in the initial indent part of the line as an
1549 error (enabled by default).
1550</p>
1551</li>
1552<li>
1553<p>
1554<tt>indent-with-non-tab</tt> treats a line that is indented with 8 or more
Junio C Hamano42a2e2d2007-12-16 22:13:42[diff] [blame]1555 space characters as an error (not enabled by default).
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]1556</p>
1557</li>
Junio C Hamano601f3e52008-02-25 08:40:42[diff] [blame]1558<li>
1559<p>
Junio C Hamanocb39aea2010-05-09 07:24:48[diff] [blame]1560<tt>tab-in-indent</tt> treats a tab character in the initial indent part of
1561 the line as an error (not enabled by default).
1562</p>
1563</li>
1564<li>
1565<p>
Junio C Hamanob71a22d2009-10-17 08:23:47[diff] [blame]1566<tt>blank-at-eof</tt> treats blank lines added at the end of file as an error
1567 (enabled by default).
1568</p>
1569</li>
1570<li>
1571<p>
1572<tt>trailing-space</tt> is a short-hand to cover both <tt>blank-at-eol</tt> and
1573 <tt>blank-at-eof</tt>.
1574</p>
1575</li>
1576<li>
1577<p>
Junio C Hamano601f3e52008-02-25 08:40:42[diff] [blame]1578<tt>cr-at-eol</tt> treats a carriage-return at the end of line as
1579 part of the line terminator, i.e. with it, <tt>trailing-space</tt>
1580 does not trigger if the character before such a carriage-return
1581 is not a whitespace (not enabled by default).
1582</p>
1583</li>
Junio C Hamanoeef01fe2010-12-13 08:31:58[diff] [blame]1584<li>
1585<p>
1586<tt>tabwidth=&lt;n&gt;</tt> tells how many character positions a tab occupies; this
1587 is relevant for <tt>indent-with-non-tab</tt> and when git fixes <tt>tab-in-indent</tt>
1588 errors. The default tab width is 8. Allowed values are 1 to 63.
1589</p>
1590</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1591</ul></div>
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]1592</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1593<dt class="hdlist1">
Junio C Hamano9eb57532008-06-26 06:33:46[diff] [blame]1594core.fsyncobjectfiles
1595</dt>
1596<dd>
1597<p>
1598 This boolean will enable <em>fsync()</em> when writing object files.
1599</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1600<div class="paragraph"><p>This is a total waste of time and effort on a filesystem that orders
Junio C Hamano9eb57532008-06-26 06:33:46[diff] [blame]1601data writes properly, but can be useful for filesystems that do not use
1602journalling (traditional UNIX filesystems) or that only journal metadata
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1603and not file contents (OS X&#8217;s HFS+, or Linux ext3 with "data=writeback").</p></div>
Junio C Hamano9eb57532008-06-26 06:33:46[diff] [blame]1604</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1605<dt class="hdlist1">
Junio C Hamano610d1762008-11-28 06:27:13[diff] [blame]1606core.preloadindex
1607</dt>
1608<dd>
1609<p>
1610 Enable parallel index preload for operations like <em>git diff</em>
1611</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1612<div class="paragraph"><p>This can speed up operations like <em>git diff</em> and <em>git status</em> especially
Junio C Hamano610d1762008-11-28 06:27:13[diff] [blame]1613on filesystems like NFS that have weak caching semantics and thus
1614relatively high IO latencies. With this set to <em>true</em>, git will do the
1615index comparison to the filesystem data in parallel, allowing
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1616overlapping IO&#8217;s.</p></div>
Junio C Hamano610d1762008-11-28 06:27:13[diff] [blame]1617</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1618<dt class="hdlist1">
Junio C Hamanoa9499de2009-04-30 03:38:48[diff] [blame]1619core.createObject
Junio C Hamanoe91ea772009-04-26 01:41:41[diff] [blame]1620</dt>
1621<dd>
1622<p>
Junio C Hamanoa9499de2009-04-30 03:38:48[diff] [blame]1623 You can set this to <em>link</em>, in which case a hardlink followed by
1624 a delete of the source are used to make sure that object creation
1625 will not overwrite existing objects.
Junio C Hamanoe91ea772009-04-26 01:41:41[diff] [blame]1626</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1627<div class="paragraph"><p>On some file system/operating system combinations, this is unreliable.
Junio C Hamanoa9499de2009-04-30 03:38:48[diff] [blame]1628Set this config setting to <em>rename</em> there; However, This will remove the
1629check that makes sure that existing object files will not get overwritten.</p></div>
Junio C Hamanoe91ea772009-04-26 01:41:41[diff] [blame]1630</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1631<dt class="hdlist1">
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]1632core.notesRef
1633</dt>
1634<dd>
1635<p>
1636 When showing commit messages, also show notes which are stored in
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]1637 the given ref. The ref must be fully qualified. If the given
1638 ref does not exist, it is not an error but means that no
1639 notes should be printed.
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]1640</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1641<div class="paragraph"><p>This setting defaults to "refs/notes/commits", and it can be overridden by
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]1642the <em>GIT_NOTES_REF</em> environment variable. See <a href="git-notes.html">git-notes(1)</a>.</p></div>
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]1643</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1644<dt class="hdlist1">
Junio C Hamano3c8d6702010-01-13 23:09:03[diff] [blame]1645core.sparseCheckout
1646</dt>
1647<dd>
1648<p>
1649 Enable "sparse checkout" feature. See section "Sparse checkout" in
1650 <a href="git-read-tree.html">git-read-tree(1)</a> for more information.
1651</p>
1652</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1653<dt class="hdlist1">
Junio C Hamano6371b0e2011-03-23 23:36:21[diff] [blame]1654core.abbrev
1655</dt>
1656<dd>
1657<p>
1658 Set the length object names are abbreviated to. If unspecified,
1659 many commands abbreviate to 7 hexdigits, which may not be enough
1660 for abbreviated object names to stay unique for sufficiently long
1661 time.
1662</p>
1663</dd>
1664<dt class="hdlist1">
Junio C Hamano3d141512009-06-01 01:22:40[diff] [blame]1665add.ignore-errors
1666</dt>
Junio C Hamano60186642010-12-02 14:18:26[diff] [blame]1667<dt class="hdlist1">
1668add.ignoreErrors
1669</dt>
Junio C Hamano3d141512009-06-01 01:22:40[diff] [blame]1670<dd>
1671<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1672 Tells <em>git add</em> to continue adding files when some files cannot be
Junio C Hamano3d141512009-06-01 01:22:40[diff] [blame]1673 added due to indexing errors. Equivalent to the <em>--ignore-errors</em>
Junio C Hamano60186642010-12-02 14:18:26[diff] [blame]1674 option of <a href="git-add.html">git-add(1)</a>. Older versions of git accept only
1675 <tt>add.ignore-errors</tt>, which does not follow the usual naming
1676 convention for configuration variables. Newer versions of git
1677 honor <tt>add.ignoreErrors</tt> as well.
Junio C Hamano3d141512009-06-01 01:22:40[diff] [blame]1678</p>
1679</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1680<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1681alias.*
1682</dt>
1683<dd>
1684<p>
1685 Command aliases for the <a href="git.html">git(1)</a> command wrapper - e.g.
1686 after defining "alias.last = cat-file commit HEAD", the invocation
1687 "git last" is equivalent to "git cat-file commit HEAD". To avoid
1688 confusion and troubles with script usage, aliases that
1689 hide existing git commands are ignored. Arguments are split by
1690 spaces, the usual shell quoting and escaping is supported.
1691 quote pair and a backslash can be used to quote them.
1692</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1693<div class="paragraph"><p>If the alias expansion is prefixed with an exclamation point,
Junio C Hamano9cb74f22007-02-12 04:15:05[diff] [blame]1694it will be treated as a shell command. For example, defining
1695"alias.new = !gitk --all --not ORIG_HEAD", the invocation
1696"git new" is equivalent to running the shell command
Junio C Hamano48bc1ce2009-07-09 16:49:19[diff] [blame]1697"gitk --all --not ORIG_HEAD". Note that shell commands will be
1698executed from the top-level directory of a repository, which may
1699not necessarily be the current directory.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1700</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1701<dt class="hdlist1">
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]1702am.keepcr
1703</dt>
1704<dd>
1705<p>
1706 If true, git-am will call git-mailsplit for patches in mbox format
1707 with parameter <em>--keep-cr</em>. In this case git-mailsplit will
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1708 not remove <tt>\r</tt> from lines ending with <tt>\r\n</tt>. Can be overridden
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]1709 by giving <em>--no-keep-cr</em> from the command line.
1710 See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>.
1711</p>
1712</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1713<dt class="hdlist1">
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]1714apply.ignorewhitespace
1715</dt>
1716<dd>
1717<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1718 When set to <em>change</em>, tells <em>git apply</em> to ignore changes in
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]1719 whitespace, in the same way as the <em>--ignore-space-change</em>
1720 option.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1721 When set to one of: no, none, never, false tells <em>git apply</em> to
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]1722 respect all whitespace differences.
1723 See <a href="git-apply.html">git-apply(1)</a>.
1724</p>
1725</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1726<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1727apply.whitespace
1728</dt>
1729<dd>
1730<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1731 Tells <em>git apply</em> how to handle whitespaces, in the same way
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1732 as the <em>--whitespace</em> option. See <a href="git-apply.html">git-apply(1)</a>.
1733</p>
1734</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1735<dt class="hdlist1">
Junio C Hamano7fd84172007-05-24 07:00:32[diff] [blame]1736branch.autosetupmerge
1737</dt>
1738<dd>
1739<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1740 Tells <em>git branch</em> and <em>git checkout</em> to set up new branches
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1741 so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from the
1742 starting point branch. Note that even if this option is not set,
Junio C Hamano7fd84172007-05-24 07:00:32[diff] [blame]1743 this behavior can be chosen per-branch using the <tt>--track</tt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1744 and <tt>--no-track</tt> options. The valid settings are: <tt>false</tt>&#8201;&#8212;&#8201;no
1745 automatic setup is done; <tt>true</tt>&#8201;&#8212;&#8201;automatic setup is done when the
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]1746 starting point is a remote-tracking branch; <tt>always</tt>&#8201;&#8212;&#8201; automatic setup is done when the starting point is either a
1747 local branch or remote-tracking
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]1748 branch. This option defaults to true.
Junio C Hamano7fd84172007-05-24 07:00:32[diff] [blame]1749</p>
1750</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1751<dt class="hdlist1">
Junio C Hamano869bb802008-05-12 00:29:47[diff] [blame]1752branch.autosetuprebase
1753</dt>
1754<dd>
1755<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1756 When a new branch is created with <em>git branch</em> or <em>git checkout</em>
Junio C Hamano869bb802008-05-12 00:29:47[diff] [blame]1757 that tracks another branch, this variable tells git to set
1758 up pull to rebase instead of merge (see "branch.&lt;name&gt;.rebase").
1759 When <tt>never</tt>, rebase is never automatically set to true.
1760 When <tt>local</tt>, rebase is set to true for tracked branches of
1761 other local branches.
1762 When <tt>remote</tt>, rebase is set to true for tracked branches of
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]1763 remote-tracking branches.
Junio C Hamano869bb802008-05-12 00:29:47[diff] [blame]1764 When <tt>always</tt>, rebase will be set to true for all tracking
1765 branches.
1766 See "branch.autosetupmerge" for details on how to set up a
1767 branch to track another branch.
1768 This option defaults to never.
1769</p>
1770</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1771<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1772branch.&lt;name&gt;.remote
1773</dt>
1774<dd>
1775<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1776 When in branch &lt;name&gt;, it tells <em>git fetch</em> and <em>git push</em> which
Junio C Hamano0706c802009-03-30 22:34:19[diff] [blame]1777 remote to fetch from/push to. It defaults to <tt>origin</tt> if no remote is
1778 configured. <tt>origin</tt> is also used if you are not on any branch.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1779</p>
1780</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1781<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1782branch.&lt;name&gt;.merge
1783</dt>
1784<dd>
1785<p>
Junio C Hamano0706c802009-03-30 22:34:19[diff] [blame]1786 Defines, together with branch.&lt;name&gt;.remote, the upstream branch
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1787 for the given branch. It tells <em>git fetch</em>/<em>git pull</em> which
1788 branch to merge and can also affect <em>git push</em> (see push.default).
1789 When in branch &lt;name&gt;, it tells <em>git fetch</em> the default
Junio C Hamanoc2b47092007-10-25 06:50:31[diff] [blame]1790 refspec to be marked for merging in FETCH_HEAD. The value is
1791 handled like the remote part of a refspec, and must match a
1792 ref which is fetched from the remote given by
1793 "branch.&lt;name&gt;.remote".
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1794 The merge information is used by <em>git pull</em> (which at first calls
1795 <em>git fetch</em>) to lookup the default branch for merging. Without
1796 this option, <em>git pull</em> defaults to merge the first refspec fetched.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1797 Specify multiple values to get an octopus merge.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1798 If you wish to setup <em>git pull</em> so that it merges into &lt;name&gt; from
Junio C Hamano6e149c02007-03-16 10:21:07[diff] [blame]1799 another branch in the local repository, you can point
1800 branch.&lt;name&gt;.merge to the desired branch, and use the special setting
1801 <tt>.</tt> (a period) for branch.&lt;name&gt;.remote.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1802</p>
1803</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1804<dt class="hdlist1">
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]1805branch.&lt;name&gt;.mergeoptions
1806</dt>
1807<dd>
1808<p>
1809 Sets default options for merging into branch &lt;name&gt;. The syntax and
Junio C Hamanoc0e55e72009-10-10 00:56:29[diff] [blame]1810 supported options are the same as those of <a href="git-merge.html">git-merge(1)</a>, but
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]1811 option values containing whitespace characters are currently not
1812 supported.
1813</p>
1814</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1815<dt class="hdlist1">
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]1816branch.&lt;name&gt;.rebase
1817</dt>
1818<dd>
1819<p>
1820 When true, rebase the branch &lt;name&gt; on top of the fetched branch,
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]1821 instead of merging the default branch from the default remote when
1822 "git pull" is run.
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]1823 <strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use
1824 it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a>
1825 for details).
1826</p>
1827</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1828<dt class="hdlist1">
Junio C Hamano8760ea62008-03-14 08:58:45[diff] [blame]1829browser.&lt;tool&gt;.cmd
1830</dt>
1831<dd>
1832<p>
1833 Specify the command to invoke the specified browser. The
1834 specified command is evaluated in shell with the URLs passed
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1835 as arguments. (See <a href="git-web&#8212;browse.html">git-web&#8212;browse(1)</a>.)
Junio C Hamano8760ea62008-03-14 08:58:45[diff] [blame]1836</p>
1837</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1838<dt class="hdlist1">
Junio C Hamanoe35a6fc2008-01-29 09:46:27[diff] [blame]1839browser.&lt;tool&gt;.path
1840</dt>
1841<dd>
1842<p>
1843 Override the path for the given tool that may be used to
1844 browse HTML help (see <em>-w</em> option in <a href="git-help.html">git-help(1)</a>) or a
1845 working repository in gitweb (see <a href="git-instaweb.html">git-instaweb(1)</a>).
1846</p>
1847</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1848<dt class="hdlist1">
Junio C Hamano47b9acd2007-04-24 07:34:34[diff] [blame]1849clean.requireForce
1850</dt>
1851<dd>
1852<p>
Junio C Hamano422cfec2007-11-08 08:07:45[diff] [blame]1853 A boolean to make git-clean do nothing unless given -f
1854 or -n. Defaults to true.
Junio C Hamano47b9acd2007-04-24 07:34:34[diff] [blame]1855</p>
1856</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1857<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1858color.branch
1859</dt>
1860<dd>
1861<p>
1862 A boolean to enable/disable color in the output of
Junio C Hamano0fc8cd92007-12-06 03:26:21[diff] [blame]1863 <a href="git-branch.html">git-branch(1)</a>. May be set to <tt>always</tt>,
1864 <tt>false</tt> (or <tt>never</tt>) or <tt>auto</tt> (or <tt>true</tt>), in which case colors are used
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1865 only when the output is to a terminal. Defaults to false.
1866</p>
1867</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1868<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1869color.branch.&lt;slot&gt;
1870</dt>
1871<dd>
1872<p>
1873 Use customized color for branch coloration. <tt>&lt;slot&gt;</tt> is one of
1874 <tt>current</tt> (the current branch), <tt>local</tt> (a local branch),
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]1875 <tt>remote</tt> (a remote-tracking branch in refs/remotes/), <tt>plain</tt> (other
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1876 refs).
1877</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1878<div class="paragraph"><p>The value for these configuration variables is a list of colors (at most
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1879two) and attributes (at most one), separated by spaces. The colors
1880accepted are <tt>normal</tt>, <tt>black</tt>, <tt>red</tt>, <tt>green</tt>, <tt>yellow</tt>, <tt>blue</tt>,
1881<tt>magenta</tt>, <tt>cyan</tt> and <tt>white</tt>; the attributes are <tt>bold</tt>, <tt>dim</tt>, <tt>ul</tt>,
1882<tt>blink</tt> and <tt>reverse</tt>. The first color given is the foreground; the
1883second is the background. The position of the attribute, if any,
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1884doesn&#8217;t matter.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1885</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1886<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1887color.diff
1888</dt>
1889<dd>
1890<p>
Junio C Hamano0fc8cd92007-12-06 03:26:21[diff] [blame]1891 When set to <tt>always</tt>, always use colors in patch.
1892 When false (or <tt>never</tt>), never. When set to <tt>true</tt> or <tt>auto</tt>, use
1893 colors only when the output is to the terminal. Defaults to false.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1894</p>
1895</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1896<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1897color.diff.&lt;slot&gt;
1898</dt>
1899<dd>
1900<p>
1901 Use customized color for diff colorization. <tt>&lt;slot&gt;</tt> specifies
1902 which part of the patch to use the specified color, and is one
1903 of <tt>plain</tt> (context text), <tt>meta</tt> (metainformation), <tt>frag</tt>
Junio C Hamano2bd8a742009-12-01 21:16:59[diff] [blame]1904 (hunk header), <em>func</em> (function in hunk header), <tt>old</tt> (removed lines),
1905 <tt>new</tt> (added lines), <tt>commit</tt> (commit headers), or <tt>whitespace</tt>
1906 (highlighting whitespace errors). The values of these variables may be
1907 specified as in color.branch.&lt;slot&gt;.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1908</p>
1909</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1910<dt class="hdlist1">
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1911color.decorate.&lt;slot&gt;
1912</dt>
1913<dd>
1914<p>
1915 Use customized color for <em>git log --decorate</em> output. <tt>&lt;slot&gt;</tt> is one
1916 of <tt>branch</tt>, <tt>remoteBranch</tt>, <tt>tag</tt>, <tt>stash</tt> or <tt>HEAD</tt> for local
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]1917 branches, remote-tracking branches, tags, stash and HEAD, respectively.
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]1918</p>
1919</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1920<dt class="hdlist1">
Junio C Hamanod257cff2009-03-18 05:27:16[diff] [blame]1921color.grep
1922</dt>
1923<dd>
1924<p>
1925 When set to <tt>always</tt>, always highlight matches. When <tt>false</tt> (or
1926 <tt>never</tt>), never. When set to <tt>true</tt> or <tt>auto</tt>, use color only
1927 when the output is written to the terminal. Defaults to <tt>false</tt>.
1928</p>
1929</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1930<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]1931color.grep.&lt;slot&gt;
Junio C Hamanod257cff2009-03-18 05:27:16[diff] [blame]1932</dt>
1933<dd>
1934<p>
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]1935 Use customized color for grep colorization. <tt>&lt;slot&gt;</tt> specifies which
1936 part of the line to use the specified color, and is one of
Junio C Hamanod257cff2009-03-18 05:27:16[diff] [blame]1937</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1938<div class="dlist"><dl>
1939<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]1940<tt>context</tt>
1941</dt>
1942<dd>
1943<p>
1944 non-matching text in context lines (when using <tt>-A</tt>, <tt>-B</tt>, or <tt>-C</tt>)
1945</p>
1946</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1947<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]1948<tt>filename</tt>
1949</dt>
1950<dd>
1951<p>
1952 filename prefix (when not using <tt>-h</tt>)
1953</p>
1954</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1955<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]1956<tt>function</tt>
1957</dt>
1958<dd>
1959<p>
1960 function name lines (when using <tt>-p</tt>)
1961</p>
1962</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1963<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]1964<tt>linenumber</tt>
1965</dt>
1966<dd>
1967<p>
1968 line number prefix (when using <tt>-n</tt>)
1969</p>
1970</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1971<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]1972<tt>match</tt>
1973</dt>
1974<dd>
1975<p>
1976 matching text
1977</p>
1978</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1979<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]1980<tt>selected</tt>
1981</dt>
1982<dd>
1983<p>
1984 non-matching text in selected lines
1985</p>
1986</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1987<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]1988<tt>separator</tt>
1989</dt>
1990<dd>
1991<p>
1992 separators between fields on a line (<tt>:</tt>, <tt>-</tt>, and <tt>=</tt>)
1993 and between hunks (<tt>--</tt>)
1994</p>
1995</dd>
1996</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1997<div class="paragraph"><p>The values of these variables may be specified as in color.branch.&lt;slot&gt;.</p></div>
Junio C Hamanod257cff2009-03-18 05:27:16[diff] [blame]1998</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1999<dt class="hdlist1">
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]2000color.interactive
2001</dt>
2002<dd>
2003<p>
Junio C Hamano35738e82008-01-07 07:55:46[diff] [blame]2004 When set to <tt>always</tt>, always use colors for interactive prompts
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2005 and displays (such as those used by "git-add --interactive").
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]2006 When false (or <tt>never</tt>), never. When set to <tt>true</tt> or <tt>auto</tt>, use
2007 colors only when the output is to the terminal. Defaults to false.
2008</p>
2009</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2010<dt class="hdlist1">
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]2011color.interactive.&lt;slot&gt;
2012</dt>
2013<dd>
2014<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2015 Use customized color for <em>git add --interactive</em>
Junio C Hamanoe5bf6c12009-02-07 21:43:10[diff] [blame]2016 output. <tt>&lt;slot&gt;</tt> may be <tt>prompt</tt>, <tt>header</tt>, <tt>help</tt> or <tt>error</tt>, for
2017 four distinct types of normal output from interactive
Junio C Hamano27a128b2009-08-13 01:23:00[diff] [blame]2018 commands. The values of these variables may be specified as
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]2019 in color.branch.&lt;slot&gt;.
2020</p>
2021</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2022<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2023color.pager
2024</dt>
2025<dd>
2026<p>
2027 A boolean to enable/disable colored output when the pager is in
2028 use (default is true).
2029</p>
2030</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2031<dt class="hdlist1">
Junio C Hamano52ba2952009-05-18 17:43:02[diff] [blame]2032color.showbranch
2033</dt>
2034<dd>
2035<p>
2036 A boolean to enable/disable color in the output of
2037 <a href="git-show-branch.html">git-show-branch(1)</a>. May be set to <tt>always</tt>,
2038 <tt>false</tt> (or <tt>never</tt>) or <tt>auto</tt> (or <tt>true</tt>), in which case colors are used
2039 only when the output is to a terminal. Defaults to false.
2040</p>
2041</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2042<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2043color.status
2044</dt>
2045<dd>
2046<p>
2047 A boolean to enable/disable color in the output of
Junio C Hamano0fc8cd92007-12-06 03:26:21[diff] [blame]2048 <a href="git-status.html">git-status(1)</a>. May be set to <tt>always</tt>,
2049 <tt>false</tt> (or <tt>never</tt>) or <tt>auto</tt> (or <tt>true</tt>), in which case colors are used
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2050 only when the output is to a terminal. Defaults to false.
2051</p>
2052</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2053<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2054color.status.&lt;slot&gt;
2055</dt>
2056<dd>
2057<p>
2058 Use customized color for status colorization. <tt>&lt;slot&gt;</tt> is
2059 one of <tt>header</tt> (the header text of the status message),
2060 <tt>added</tt> or <tt>updated</tt> (files which are added but not committed),
2061 <tt>changed</tt> (files which are changed but not added in the index),
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]2062 <tt>untracked</tt> (files which are not tracked by git),
2063 <tt>branch</tt> (the current branch), or
Junio C Hamanob713ff12008-05-24 01:12:30[diff] [blame]2064 <tt>nobranch</tt> (the color the <em>no branch</em> warning is shown in, defaulting
2065 to red). The values of these variables may be specified as in
2066 color.branch.&lt;slot&gt;.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2067</p>
2068</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2069<dt class="hdlist1">
Junio C Hamano83d46a22008-02-21 02:29:42[diff] [blame]2070color.ui
2071</dt>
2072<dd>
2073<p>
2074 When set to <tt>always</tt>, always use colors in all git commands which
2075 are capable of colored output. When false (or <tt>never</tt>), never. When
2076 set to <tt>true</tt> or <tt>auto</tt>, use colors only when the output is to the
2077 terminal. When more specific variables of color.* are set, they always
2078 take precedence over this setting. Defaults to false.
2079</p>
2080</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2081<dt class="hdlist1">
Junio C Hamanod0d892c2010-01-24 20:06:29[diff] [blame]2082commit.status
2083</dt>
2084<dd>
2085<p>
Junio C Hamano6ce6b6c2010-01-18 01:25:50[diff] [blame]2086 A boolean to enable/disable inclusion of status information in the
2087 commit message template when using an editor to prepare the commit
Junio C Hamanod0d892c2010-01-24 20:06:29[diff] [blame]2088 message. Defaults to true.
2089</p>
2090</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2091<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]2092commit.template
2093</dt>
2094<dd>
2095<p>
2096 Specify a file to use as the template for new commit messages.
Junio C Hamanobf984de2009-11-23 06:11:19[diff] [blame]2097 "&#126;/" is expanded to the value of <tt>$HOME</tt> and "&#126;user/" to the
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2098 specified user&#8217;s home directory.
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]2099</p>
2100</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2101<dt class="hdlist1">
Junio C Hamanodbb64592007-09-01 11:17:39[diff] [blame]2102diff.autorefreshindex
2103</dt>
2104<dd>
2105<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2106 When using <em>git diff</em> to compare with work tree
Junio C Hamanodbb64592007-09-01 11:17:39[diff] [blame]2107 files, do not consider stat-only change as changed.
2108 Instead, silently run <tt>git update-index --refresh</tt> to
2109 update the cached stat information for paths whose
2110 contents in the work tree match the contents in the
2111 index. This option defaults to true. Note that this
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2112 affects only <em>git diff</em> Porcelain, and not lower level
2113 <em>diff</em> commands such as <em>git diff-files</em>.
Junio C Hamanodbb64592007-09-01 11:17:39[diff] [blame]2114</p>
2115</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2116<dt class="hdlist1">
Junio C Hamano1fbbbc12007-12-18 07:01:27[diff] [blame]2117diff.external
2118</dt>
2119<dd>
2120<p>
2121 If this config variable is set, diff generation is not
2122 performed using the internal diff machinery, but using the
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2123 given command. Can be overridden with the &#8216;GIT_EXTERNAL_DIFF&#8217;
Junio C Hamano85c71572008-07-28 00:03:31[diff] [blame]2124 environment variable. The command is called with parameters
2125 as described under "git Diffs" in <a href="git.html">git(1)</a>. Note: if
2126 you want to use an external diff program only on a subset of
2127 your files, you might want to use <a href="gitattributes.html">gitattributes(5)</a> instead.
Junio C Hamano1fbbbc12007-12-18 07:01:27[diff] [blame]2128</p>
2129</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2130<dt class="hdlist1">
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]2131diff.mnemonicprefix
2132</dt>
2133<dd>
2134<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2135 If set, <em>git diff</em> uses a prefix pair that is different from the
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]2136 standard "a/" and "b/" depending on what is being compared. When
2137 this configuration is in effect, reverse diff output also swaps
2138 the order of the prefixes:
2139</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2140<div class="dlist"><dl>
2141<dt class="hdlist1">
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2142<tt>git diff</tt>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]2143</dt>
2144<dd>
2145<p>
2146 compares the (i)ndex and the (w)ork tree;
2147</p>
2148</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2149<dt class="hdlist1">
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2150<tt>git diff HEAD</tt>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]2151</dt>
2152<dd>
2153<p>
2154 compares a (c)ommit and the (w)ork tree;
2155</p>
2156</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2157<dt class="hdlist1">
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2158<tt>git diff --cached</tt>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]2159</dt>
2160<dd>
2161<p>
2162 compares a (c)ommit and the (i)ndex;
2163</p>
2164</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2165<dt class="hdlist1">
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2166<tt>git diff HEAD:file1 file2</tt>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]2167</dt>
2168<dd>
2169<p>
2170 compares an (o)bject and a (w)ork tree entity;
2171</p>
2172</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2173<dt class="hdlist1">
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2174<tt>git diff --no-index a b</tt>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]2175</dt>
2176<dd>
2177<p>
2178 compares two non-git things (1) and (2).
2179</p>
2180</dd>
2181</dl></div>
2182</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2183<dt class="hdlist1">
Junio C Hamano21c2d142010-09-10 18:09:27[diff] [blame]2184diff.noprefix
2185</dt>
2186<dd>
2187<p>
2188 If set, <em>git diff</em> does not show any source or destination prefix.
2189</p>
2190</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2191<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2192diff.renameLimit
2193</dt>
2194<dd>
2195<p>
2196 The number of files to consider when performing the copy/rename
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2197 detection; equivalent to the <em>git diff</em> option <em>-l</em>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2198</p>
2199</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2200<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2201diff.renames
2202</dt>
2203<dd>
2204<p>
2205 Tells git to detect renames. If set to any boolean value, it
2206 will enable basic rename detection. If set to "copies" or
2207 "copy", it will detect copies, as well.
2208</p>
2209</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2210<dt class="hdlist1">
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]2211diff.ignoreSubmodules
2212</dt>
2213<dd>
2214<p>
2215 Sets the default value of --ignore-submodules. Note that this
2216 affects only <em>git diff</em> Porcelain, and not lower level <em>diff</em>
Junio C Hamanof0f41ba2010-09-04 16:23:06[diff] [blame]2217 commands such as <em>git diff-files</em>. <em>git checkout</em> also honors
2218 this setting when reporting uncommitted changes.
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]2219</p>
2220</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2221<dt class="hdlist1">
Junio C Hamanobc4852e2009-01-21 10:51:14[diff] [blame]2222diff.suppressBlankEmpty
Junio C Hamanof1231492008-12-22 08:27:21[diff] [blame]2223</dt>
2224<dd>
2225<p>
2226 A boolean to inhibit the standard behavior of printing a space
2227 before each empty output line. Defaults to false.
2228</p>
2229</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2230<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]2231diff.tool
2232</dt>
2233<dd>
2234<p>
2235 Controls which diff tool is used. <tt>diff.tool</tt> overrides
2236 <tt>merge.tool</tt> when used by <a href="git-difftool.html">git-difftool(1)</a> and has
2237 the same valid values as <tt>merge.tool</tt> minus "tortoisemerge"
2238 and plus "kompare".
2239</p>
2240</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2241<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]2242difftool.&lt;tool&gt;.path
2243</dt>
2244<dd>
2245<p>
2246 Override the path for the given tool. This is useful in case
2247 your tool is not in the PATH.
2248</p>
2249</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2250<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]2251difftool.&lt;tool&gt;.cmd
2252</dt>
2253<dd>
2254<p>
2255 Specify the command to invoke the specified diff tool.
2256 The specified command is evaluated in shell with the following
2257 variables available: <em>LOCAL</em> is set to the name of the temporary
2258 file containing the contents of the diff pre-image and <em>REMOTE</em>
2259 is set to the name of the temporary file containing the contents
2260 of the diff post-image.
2261</p>
2262</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2263<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]2264difftool.prompt
2265</dt>
2266<dd>
2267<p>
2268 Prompt before each invocation of the diff tool.
2269</p>
2270</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2271<dt class="hdlist1">
Junio C Hamano20d47e32009-01-26 06:36:02[diff] [blame]2272diff.wordRegex
2273</dt>
2274<dd>
2275<p>
2276 A POSIX Extended Regular Expression used to determine what is a "word"
2277 when performing word-by-word difference calculations. Character
2278 sequences that match the regular expression are "words", all other
2279 characters are <strong>ignorable</strong> whitespace.
2280</p>
2281</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2282<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]2283fetch.recurseSubmodules
2284</dt>
2285<dd>
2286<p>
2287 A boolean value which changes the behavior for fetch and pull, the
Junio C Hamano7165bf72011-01-04 22:06:18[diff] [blame]2288 default is to not recursively fetch populated submodules unless
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]2289 configured otherwise.
2290</p>
2291</dd>
2292<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2293fetch.unpackLimit
2294</dt>
2295<dd>
2296<p>
2297 If the number of objects fetched over the git native
2298 transfer is below this
2299 limit, then the objects will be unpacked into loose object
2300 files. However if the number of received objects equals or
2301 exceeds this limit then the received pack will be stored as
2302 a pack, after adding any missing delta bases. Storing the
2303 pack from a push can make the push operation complete faster,
Junio C Hamanoe77b0152008-01-12 06:44:17[diff] [blame]2304 especially on slow filesystems. If not set, the value of
2305 <tt>transfer.unpackLimit</tt> is used instead.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2306</p>
2307</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2308<dt class="hdlist1">
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]2309format.attach
2310</dt>
2311<dd>
2312<p>
2313 Enable multipart/mixed attachments as the default for
2314 <em>format-patch</em>. The value can also be a double quoted string
2315 which will enable attachments as the default and set the
2316 value as the boundary. See the --attach option in
2317 <a href="git-format-patch.html">git-format-patch(1)</a>.
2318</p>
2319</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2320<dt class="hdlist1">
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]2321format.numbered
2322</dt>
2323<dd>
2324<p>
Junio C Hamano7d06a8a2008-10-20 05:42:33[diff] [blame]2325 A boolean which can enable or disable sequence numbers in patch
2326 subjects. It defaults to "auto" which enables it only if there
2327 is more than one patch. It can be enabled or disabled for all
2328 messages by setting it to "true" or "false". See --numbered
2329 option in <a href="git-format-patch.html">git-format-patch(1)</a>.
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]2330</p>
2331</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2332<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2333format.headers
2334</dt>
2335<dd>
2336<p>
2337 Additional email headers to include in a patch to be submitted
2338 by mail. See <a href="git-format-patch.html">git-format-patch(1)</a>.
2339</p>
2340</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2341<dt class="hdlist1">
Junio C Hamano70664a02010-07-13 22:48:05[diff] [blame]2342format.to
2343</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2344<dt class="hdlist1">
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]2345format.cc
2346</dt>
2347<dd>
2348<p>
Junio C Hamano70664a02010-07-13 22:48:05[diff] [blame]2349 Additional recipients to include in a patch to be submitted
2350 by mail. See the --to and --cc options in
2351 <a href="git-format-patch.html">git-format-patch(1)</a>.
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]2352</p>
2353</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2354<dt class="hdlist1">
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]2355format.subjectprefix
2356</dt>
2357<dd>
2358<p>
2359 The default for format-patch is to output files with the <em>[PATCH]</em>
2360 subject prefix. Use this variable to change that prefix.
2361</p>
2362</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2363<dt class="hdlist1">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]2364format.signature
2365</dt>
2366<dd>
2367<p>
2368 The default for format-patch is to output a signature containing
2369 the git version number. Use this variable to change that default.
2370 Set this variable to the empty string ("") to suppress
2371 signature generation.
2372</p>
2373</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2374<dt class="hdlist1">
Junio C Hamanod4c8e112007-03-04 10:32:38[diff] [blame]2375format.suffix
2376</dt>
2377<dd>
2378<p>
2379 The default for format-patch is to output files with the suffix
2380 <tt>.patch</tt>. Use this variable to change that suffix (make sure to
2381 include the dot if you want it).
2382</p>
2383</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2384<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]2385format.pretty
2386</dt>
2387<dd>
2388<p>
2389 The default pretty format for log/show/whatchanged command,
2390 See <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>,
2391 <a href="git-whatchanged.html">git-whatchanged(1)</a>.
2392</p>
2393</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2394<dt class="hdlist1">
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]2395format.thread
2396</dt>
2397<dd>
2398<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2399 The default threading style for <em>git format-patch</em>. Can be
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]2400 a boolean value, or <tt>shallow</tt> or <tt>deep</tt>. <tt>shallow</tt> threading
2401 makes every mail a reply to the head of the series,
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]2402 where the head is chosen from the cover letter, the
2403 <tt>--in-reply-to</tt>, and the first patch mail, in this order.
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]2404 <tt>deep</tt> threading makes every mail a reply to the previous one.
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]2405 A true boolean value is the same as <tt>shallow</tt>, and a false
2406 value disables threading.
2407</p>
2408</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2409<dt class="hdlist1">
Junio C Hamano5f9a6f02009-04-06 08:26:56[diff] [blame]2410format.signoff
2411</dt>
2412<dd>
2413<p>
2414 A boolean value which lets you enable the <tt>-s/--signoff</tt> option of
2415 format-patch by default. <strong>Note:</strong> Adding the Signed-off-by: line to a
2416 patch should be a conscious act and means that you certify you have
2417 the rights to submit this work under the same open source license.
2418 Please see the <em>SubmittingPatches</em> document for further discussion.
2419</p>
2420</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2421<dt class="hdlist1">
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]2422gc.aggressiveWindow
2423</dt>
2424<dd>
2425<p>
2426 The window size parameter used in the delta compression
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2427 algorithm used by <em>git gc --aggressive</em>. This defaults
Junio C Hamanob04bb3f2010-04-14 14:07:36[diff] [blame]2428 to 250.
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]2429</p>
2430</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2431<dt class="hdlist1">
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]2432gc.auto
2433</dt>
2434<dd>
2435<p>
2436 When there are approximately more than this many loose
2437 objects in the repository, <tt>git gc --auto</tt> will pack them.
2438 Some Porcelain commands use this command to perform a
Junio C Hamanoe77b0152008-01-12 06:44:17[diff] [blame]2439 light-weight garbage collection from time to time. The
2440 default value is 6700. Setting this to 0 disables it.
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]2441</p>
2442</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2443<dt class="hdlist1">
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]2444gc.autopacklimit
2445</dt>
2446<dd>
2447<p>
2448 When there are more than this many packs that are not
2449 marked with <tt>*.keep</tt> file in the repository, <tt>git gc
Junio C Hamanoe77b0152008-01-12 06:44:17[diff] [blame]2450 --auto</tt> consolidates them into one larger pack. The
Junio C Hamano25c0b702008-03-23 09:41:37[diff] [blame]2451 default value is 50. Setting this to 0 disables it.
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]2452</p>
2453</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2454<dt class="hdlist1">
Junio C Hamano9d52e572007-02-13 23:48:20[diff] [blame]2455gc.packrefs
2456</dt>
2457<dd>
2458<p>
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]2459 Running <tt>git pack-refs</tt> in a repository renders it
2460 unclonable by Git versions prior to 1.5.1.2 over dumb
2461 transports such as HTTP. This variable determines whether
Junio C Hamanocdd1c332010-12-20 10:08:00[diff] [blame]2462 <em>git gc</em> runs <tt>git pack-refs</tt>. This can be set to <tt>notbare</tt>
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]2463 to enable it within all non-bare repos or it can be set to a
2464 boolean value. The default is <tt>true</tt>.
Junio C Hamano9d52e572007-02-13 23:48:20[diff] [blame]2465</p>
2466</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2467<dt class="hdlist1">
Junio C Hamano09a926d2008-03-13 07:55:29[diff] [blame]2468gc.pruneexpire
2469</dt>
2470<dd>
2471<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2472 When <em>git gc</em> is run, it will call <em>prune --expire 2.weeks.ago</em>.
Junio C Hamanoa3148f52009-01-14 08:49:57[diff] [blame]2473 Override the grace period with this config variable. The value
2474 "now" may be used to disable this grace period and always prune
2475 unreachable objects immediately.
Junio C Hamano09a926d2008-03-13 07:55:29[diff] [blame]2476</p>
2477</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2478<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2479gc.reflogexpire
2480</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2481<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]2482gc.&lt;pattern&gt;.reflogexpire
2483</dt>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2484<dd>
2485<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2486 <em>git reflog expire</em> removes reflog entries older than
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]2487 this time; defaults to 90 days. With "&lt;pattern&gt;" (e.g.
2488 "refs/stash") in the middle the setting applies only to
2489 the refs that match the &lt;pattern&gt;.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2490</p>
2491</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2492<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2493gc.reflogexpireunreachable
2494</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2495<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]2496gc.&lt;ref&gt;.reflogexpireunreachable
2497</dt>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2498<dd>
2499<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2500 <em>git reflog expire</em> removes reflog entries older than
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2501 this time and are not reachable from the current tip;
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]2502 defaults to 30 days. With "&lt;pattern&gt;" (e.g. "refs/stash")
2503 in the middle, the setting applies only to the refs that
2504 match the &lt;pattern&gt;.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2505</p>
2506</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2507<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2508gc.rerereresolved
2509</dt>
2510<dd>
2511<p>
2512 Records of conflicted merge you resolved earlier are
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2513 kept for this many days when <em>git rerere gc</em> is run.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2514 The default is 60 days. See <a href="git-rerere.html">git-rerere(1)</a>.
2515</p>
2516</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2517<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2518gc.rerereunresolved
2519</dt>
2520<dd>
2521<p>
2522 Records of conflicted merge you have not resolved are
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2523 kept for this many days when <em>git rerere gc</em> is run.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2524 The default is 15 days. See <a href="git-rerere.html">git-rerere(1)</a>.
2525</p>
2526</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2527<dt class="hdlist1">
Junio C Hamanoa3148f52009-01-14 08:49:57[diff] [blame]2528gitcvs.commitmsgannotation
2529</dt>
2530<dd>
2531<p>
2532 Append this string to each commit message. Set to empty string
2533 to disable this feature. Defaults to "via git-CVS emulator".
2534</p>
2535</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2536<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2537gitcvs.enabled
2538</dt>
2539<dd>
2540<p>
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]2541 Whether the CVS server interface is enabled for this repository.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2542 See <a href="git-cvsserver.html">git-cvsserver(1)</a>.
2543</p>
2544</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2545<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2546gitcvs.logfile
2547</dt>
2548<dd>
2549<p>
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]2550 Path to a log file where the CVS server interface well&#8230; logs
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2551 various stuff. See <a href="git-cvsserver.html">git-cvsserver(1)</a>.
2552</p>
2553</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2554<dt class="hdlist1">
Junio C Hamano17bd2272008-09-01 06:11:17[diff] [blame]2555gitcvs.usecrlfattr
2556</dt>
2557<dd>
2558<p>
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]2559 If true, the server will look up the end-of-line conversion
2560 attributes for files to determine the <em>-k</em> modes to use. If
2561 the attributes force git to treat a file as text,
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]2562 the <em>-k</em> mode will be left blank so CVS clients will
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]2563 treat it as text. If they suppress text conversion, the file
Junio C Hamanocb1c44f2008-08-06 06:19:33[diff] [blame]2564 will be set with <em>-kb</em> mode, which suppresses any newline munging
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]2565 the client might otherwise do. If the attributes do not allow
2566 the file type to be determined, then <em>gitcvs.allbinary</em> is
2567 used. See <a href="gitattributes.html">gitattributes(5)</a>.
Junio C Hamano17bd2272008-09-01 06:11:17[diff] [blame]2568</p>
2569</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2570<dt class="hdlist1">
Junio C Hamanod9e0e5d2007-04-14 16:22:04[diff] [blame]2571gitcvs.allbinary
2572</dt>
2573<dd>
2574<p>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]2575 This is used if <em>gitcvs.usecrlfattr</em> does not resolve
2576 the correct <em>-kb</em> mode to use. If true, all
2577 unresolved files are sent to the client in
2578 mode <em>-kb</em>. This causes the client to treat them
2579 as binary files, which suppresses any newline munging it
2580 otherwise might do. Alternatively, if it is set to "guess",
2581 then the contents of the file are examined to decide if
2582 it is binary, similar to <em>core.autocrlf</em>.
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]2583</p>
2584</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2585<dt class="hdlist1">
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]2586gitcvs.dbname
2587</dt>
2588<dd>
2589<p>
2590 Database used by git-cvsserver to cache revision information
2591 derived from the git repository. The exact meaning depends on the
2592 used database driver, for SQLite (which is the default driver) this
2593 is a filename. Supports variable substitution (see
2594 <a href="git-cvsserver.html">git-cvsserver(1)</a> for details). May not contain semicolons (<tt>;</tt>).
2595 Default: <em>%Ggitcvs.%m.sqlite</em>
2596</p>
2597</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2598<dt class="hdlist1">
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]2599gitcvs.dbdriver
2600</dt>
2601<dd>
2602<p>
2603 Used Perl DBI driver. You can specify any available driver
2604 for this here, but it might not work. git-cvsserver is tested
2605 with <em>DBD::SQLite</em>, reported to work with <em>DBD::Pg</em>, and
2606 reported <strong>not</strong> to work with <em>DBD::mysql</em>. Experimental feature.
2607 May not contain double colons (<tt>:</tt>). Default: <em>SQLite</em>.
Junio C Hamanod9e0e5d2007-04-14 16:22:04[diff] [blame]2608 See <a href="git-cvsserver.html">git-cvsserver(1)</a>.
2609</p>
2610</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2611<dt class="hdlist1">
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]2612gitcvs.dbuser, gitcvs.dbpass
2613</dt>
2614<dd>
2615<p>
2616 Database user and password. Only useful if setting <em>gitcvs.dbdriver</em>,
2617 since SQLite has no concept of database users and/or passwords.
2618 <em>gitcvs.dbuser</em> supports variable substitution (see
2619 <a href="git-cvsserver.html">git-cvsserver(1)</a> for details).
2620</p>
2621</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2622<dt class="hdlist1">
Junio C Hamanoa74efce2008-04-02 08:39:08[diff] [blame]2623gitcvs.dbTableNamePrefix
2624</dt>
2625<dd>
2626<p>
2627 Database table name prefix. Prepended to the names of any
2628 database tables used, allowing a single database to be used
2629 for several repositories. Supports variable substitution (see
2630 <a href="git-cvsserver.html">git-cvsserver(1)</a> for details). Any non-alphabetic
2631 characters will be replaced with underscores.
2632</p>
2633</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2634</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2635<div class="paragraph"><p>All gitcvs variables except for <em>gitcvs.usecrlfattr</em> and
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]2636<em>gitcvs.allbinary</em> can also be specified as
2637<em>gitcvs.&lt;access_method&gt;.&lt;varname&gt;</em> (where <em>access_method</em>
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]2638is one of "ext" and "pserver") to make them apply only for the given
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2639access method.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2640<div class="dlist"><dl>
2641<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]2642gui.commitmsgwidth
2643</dt>
2644<dd>
2645<p>
2646 Defines how wide the commit message window is in the
2647 <a href="git-gui.html">git-gui(1)</a>. "75" is the default.
2648</p>
2649</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2650<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]2651gui.diffcontext
2652</dt>
2653<dd>
2654<p>
2655 Specifies how many context lines should be used in calls to diff
2656 made by the <a href="git-gui.html">git-gui(1)</a>. The default is "5".
2657</p>
2658</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2659<dt class="hdlist1">
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]2660gui.encoding
2661</dt>
2662<dd>
2663<p>
2664 Specifies the default encoding to use for displaying of
2665 file contents in <a href="git-gui.html">git-gui(1)</a> and <a href="gitk.html">gitk(1)</a>.
2666 It can be overridden by setting the <em>encoding</em> attribute
2667 for relevant files (see <a href="gitattributes.html">gitattributes(5)</a>).
2668 If this option is not set, the tools default to the
2669 locale encoding.
2670</p>
2671</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2672<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]2673gui.matchtrackingbranch
2674</dt>
2675<dd>
2676<p>
2677 Determines if new branches created with <a href="git-gui.html">git-gui(1)</a> should
2678 default to tracking remote branches with matching names or
2679 not. Default: "false".
2680</p>
2681</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2682<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]2683gui.newbranchtemplate
2684</dt>
2685<dd>
2686<p>
2687 Is used as suggested name when creating new branches using the
2688 <a href="git-gui.html">git-gui(1)</a>.
2689</p>
2690</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2691<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]2692gui.pruneduringfetch
2693</dt>
2694<dd>
2695<p>
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]2696 "true" if <a href="git-gui.html">git-gui(1)</a> should prune remote-tracking branches when
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]2697 performing a fetch. The default value is "false".
2698</p>
2699</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2700<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]2701gui.trustmtime
2702</dt>
2703<dd>
2704<p>
2705 Determines if <a href="git-gui.html">git-gui(1)</a> should trust the file modification
2706 timestamp or not. By default the timestamps are not trusted.
2707</p>
2708</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2709<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]2710gui.spellingdictionary
2711</dt>
2712<dd>
2713<p>
2714 Specifies the dictionary used for spell checking commit messages in
2715 the <a href="git-gui.html">git-gui(1)</a>. When set to "none" spell checking is turned
2716 off.
2717</p>
2718</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2719<dt class="hdlist1">
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]2720gui.fastcopyblame
2721</dt>
2722<dd>
2723<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2724 If true, <em>git gui blame</em> uses <tt>-C</tt> instead of <tt>-C -C</tt> for original
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]2725 location detection. It makes blame significantly faster on huge
2726 repositories at the expense of less thorough copy detection.
2727</p>
2728</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2729<dt class="hdlist1">
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]2730gui.copyblamethreshold
2731</dt>
2732<dd>
2733<p>
Junio C Hamano610d1762008-11-28 06:27:13[diff] [blame]2734 Specifies the threshold to use in <em>git gui blame</em> original location
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]2735 detection, measured in alphanumeric characters. See the
2736 <a href="git-blame.html">git-blame(1)</a> manual for more information on copy detection.
2737</p>
2738</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2739<dt class="hdlist1">
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]2740gui.blamehistoryctx
2741</dt>
2742<dd>
2743<p>
2744 Specifies the radius of history context in days to show in
2745 <a href="gitk.html">gitk(1)</a> for the selected commit, when the <tt>Show History
2746 Context</tt> menu item is invoked from <em>git gui blame</em>. If this
2747 variable is set to zero, the whole history is shown.
2748</p>
2749</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2750<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2751guitool.&lt;name&gt;.cmd
2752</dt>
2753<dd>
2754<p>
2755 Specifies the shell command line to execute when the corresponding item
2756 of the <a href="git-gui.html">git-gui(1)</a> <tt>Tools</tt> menu is invoked. This option is
2757 mandatory for every tool. The command is executed from the root of
2758 the working directory, and in the environment it receives the name of
2759 the tool as <em>GIT_GUITOOL</em>, the name of the currently selected file as
2760 <em>FILENAME</em>, and the name of the current branch as <em>CUR_BRANCH</em> (if
2761 the head is detached, <em>CUR_BRANCH</em> is empty).
2762</p>
2763</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2764<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2765guitool.&lt;name&gt;.needsfile
2766</dt>
2767<dd>
2768<p>
2769 Run the tool only if a diff is selected in the GUI. It guarantees
2770 that <em>FILENAME</em> is not empty.
2771</p>
2772</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2773<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2774guitool.&lt;name&gt;.noconsole
2775</dt>
2776<dd>
2777<p>
2778 Run the command silently, without creating a window to display its
2779 output.
2780</p>
2781</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2782<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2783guitool.&lt;name&gt;.norescan
2784</dt>
2785<dd>
2786<p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2787 Don&#8217;t rescan the working directory for changes after the tool
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2788 finishes execution.
2789</p>
2790</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2791<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2792guitool.&lt;name&gt;.confirm
2793</dt>
2794<dd>
2795<p>
2796 Show a confirmation dialog before actually running the tool.
2797</p>
2798</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2799<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2800guitool.&lt;name&gt;.argprompt
2801</dt>
2802<dd>
2803<p>
2804 Request a string argument from the user, and pass it to the tool
2805 through the <em>ARGS</em> environment variable. Since requesting an
2806 argument implies confirmation, the <em>confirm</em> option has no effect
2807 if this is enabled. If the option is set to <em>true</em>, <em>yes</em>, or <em>1</em>,
2808 the dialog uses a built-in generic prompt; otherwise the exact
2809 value of the variable is used.
2810</p>
2811</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2812<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2813guitool.&lt;name&gt;.revprompt
2814</dt>
2815<dd>
2816<p>
2817 Request a single valid revision from the user, and set the
2818 <em>REVISION</em> environment variable. In other aspects this option
2819 is similar to <em>argprompt</em>, and can be used together with it.
2820</p>
2821</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2822<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2823guitool.&lt;name&gt;.revunmerged
2824</dt>
2825<dd>
2826<p>
2827 Show only unmerged branches in the <em>revprompt</em> subdialog.
2828 This is useful for tools similar to merge or rebase, but not
2829 for things like checkout or reset.
2830</p>
2831</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2832<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2833guitool.&lt;name&gt;.title
2834</dt>
2835<dd>
2836<p>
2837 Specifies the title to use for the prompt dialog. The default
2838 is the tool name.
2839</p>
2840</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2841<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]2842guitool.&lt;name&gt;.prompt
2843</dt>
2844<dd>
2845<p>
2846 Specifies the general prompt string to display at the top of
2847 the dialog, before subsections for <em>argprompt</em> and <em>revprompt</em>.
2848 The default value includes the actual command.
2849</p>
2850</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2851<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]2852help.browser
2853</dt>
2854<dd>
2855<p>
2856 Specify the browser that will be used to display help in the
2857 <em>web</em> format. See <a href="git-help.html">git-help(1)</a>.
2858</p>
2859</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2860<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]2861help.format
2862</dt>
2863<dd>
2864<p>
2865 Override the default help format used by <a href="git-help.html">git-help(1)</a>.
2866 Values <em>man</em>, <em>info</em>, <em>web</em> and <em>html</em> are supported. <em>man</em> is
2867 the default. <em>web</em> and <em>html</em> are the same.
2868</p>
2869</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2870<dt class="hdlist1">
Junio C Hamanof24b8062008-09-09 01:34:39[diff] [blame]2871help.autocorrect
2872</dt>
2873<dd>
2874<p>
2875 Automatically correct and execute mistyped commands after
2876 waiting for the given number of deciseconds (0.1 sec). If more
2877 than one command can be deduced from the entered text, nothing
2878 will be executed. If the value of this option is negative,
2879 the corrected command will be executed immediately. If the
2880 value is 0 - the command will be just shown but not executed.
2881 This is the default.
2882</p>
2883</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2884<dt class="hdlist1">
Junio C Hamano58256872007-12-04 08:31:13[diff] [blame]2885http.proxy
2886</dt>
2887<dd>
2888<p>
2889 Override the HTTP proxy, normally configured using the <em>http_proxy</em>
2890 environment variable (see <a href="curl.html">curl(1)</a>). This can be overridden
2891 on a per-remote basis; see remote.&lt;name&gt;.proxy
2892</p>
2893</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2894<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2895http.sslVerify
2896</dt>
2897<dd>
2898<p>
2899 Whether to verify the SSL certificate when fetching or pushing
2900 over HTTPS. Can be overridden by the <em>GIT_SSL_NO_VERIFY</em> environment
2901 variable.
2902</p>
2903</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2904<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2905http.sslCert
2906</dt>
2907<dd>
2908<p>
2909 File containing the SSL certificate when fetching or pushing
2910 over HTTPS. Can be overridden by the <em>GIT_SSL_CERT</em> environment
2911 variable.
2912</p>
2913</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2914<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2915http.sslKey
2916</dt>
2917<dd>
2918<p>
2919 File containing the SSL private key when fetching or pushing
2920 over HTTPS. Can be overridden by the <em>GIT_SSL_KEY</em> environment
2921 variable.
2922</p>
2923</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2924<dt class="hdlist1">
Junio C Hamano48bc1ce2009-07-09 16:49:19[diff] [blame]2925http.sslCertPasswordProtected
2926</dt>
2927<dd>
2928<p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2929 Enable git&#8217;s password prompt for the SSL certificate. Otherwise
Junio C Hamano48bc1ce2009-07-09 16:49:19[diff] [blame]2930 OpenSSL will prompt the user, possibly many times, if the
2931 certificate or private key is encrypted. Can be overridden by the
2932 <em>GIT_SSL_CERT_PASSWORD_PROTECTED</em> environment variable.
2933</p>
2934</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2935<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2936http.sslCAInfo
2937</dt>
2938<dd>
2939<p>
2940 File containing the certificates to verify the peer with when
2941 fetching or pushing over HTTPS. Can be overridden by the
2942 <em>GIT_SSL_CAINFO</em> environment variable.
2943</p>
2944</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2945<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2946http.sslCAPath
2947</dt>
2948<dd>
2949<p>
2950 Path containing files with the CA certificates to verify the peer
2951 with when fetching or pushing over HTTPS. Can be overridden
2952 by the <em>GIT_SSL_CAPATH</em> environment variable.
2953</p>
2954</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2955<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2956http.maxRequests
2957</dt>
2958<dd>
2959<p>
2960 How many HTTP requests to launch in parallel. Can be overridden
2961 by the <em>GIT_HTTP_MAX_REQUESTS</em> environment variable. Default is 5.
2962</p>
2963</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2964<dt class="hdlist1">
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]2965http.minSessions
2966</dt>
2967<dd>
2968<p>
2969 The number of curl sessions (counted across slots) to be kept across
2970 requests. They will not be ended with curl_easy_cleanup() until
2971 http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this
2972 value will be capped at 1. Defaults to 1.
2973</p>
2974</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2975<dt class="hdlist1">
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]2976http.postBuffer
2977</dt>
2978<dd>
2979<p>
2980 Maximum size in bytes of the buffer used by smart HTTP
2981 transports when POSTing data to the remote system.
2982 For requests larger than this buffer size, HTTP/1.1 and
2983 Transfer-Encoding: chunked is used to avoid creating a
2984 massive pack file locally. Default is 1 MiB, which is
2985 sufficient for most requests.
2986</p>
2987</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2988<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2989http.lowSpeedLimit, http.lowSpeedTime
2990</dt>
2991<dd>
2992<p>
2993 If the HTTP transfer speed is less than <em>http.lowSpeedLimit</em>
2994 for longer than <em>http.lowSpeedTime</em> seconds, the transfer is aborted.
2995 Can be overridden by the <em>GIT_HTTP_LOW_SPEED_LIMIT</em> and
2996 <em>GIT_HTTP_LOW_SPEED_TIME</em> environment variables.
2997</p>
2998</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2999<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3000http.noEPSV
3001</dt>
3002<dd>
3003<p>
3004 A boolean which disables using of EPSV ftp command by curl.
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3005 This can helpful with some "poor" ftp servers which don&#8217;t
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3006 support EPSV mode. Can be overridden by the <em>GIT_CURL_FTP_NO_EPSV</em>
3007 environment variable. Default is false (curl will use EPSV).
3008</p>
3009</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3010<dt class="hdlist1">
Junio C Hamano53ba6d02010-08-22 07:25:12[diff] [blame]3011http.useragent
3012</dt>
3013<dd>
3014<p>
3015 The HTTP USER_AGENT string presented to an HTTP server. The default
3016 value represents the version of the client git such as git/1.7.1.
3017 This option allows you to override this value to a more common value
3018 such as Mozilla/4.0. This may be necessary, for instance, if
3019 connecting through a firewall that restricts HTTP connections to a set
3020 of common USER_AGENT strings (but not including those like git/1.7.1).
3021 Can be overridden by the <em>GIT_HTTP_USER_AGENT</em> environment variable.
3022</p>
3023</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3024<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3025i18n.commitEncoding
3026</dt>
3027<dd>
3028<p>
3029 Character encoding the commit messages are stored in; git itself
3030 does not care per se, but this information is necessary e.g. when
3031 importing commits from emails or in the gitk graphical history
3032 browser (and possibly at other places in the future or in other
3033 porcelains). See e.g. <a href="git-mailinfo.html">git-mailinfo(1)</a>. Defaults to <em>utf-8</em>.
3034</p>
3035</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3036<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3037i18n.logOutputEncoding
3038</dt>
3039<dd>
3040<p>
3041 Character encoding the commit messages are converted to when
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3042 running <em>git log</em> and friends.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3043</p>
3044</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3045<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3046imap
3047</dt>
3048<dd>
3049<p>
3050 The configuration variables in the <em>imap</em> section are described
3051 in <a href="git-imap-send.html">git-imap-send(1)</a>.
3052</p>
3053</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3054<dt class="hdlist1">
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]3055init.templatedir
3056</dt>
3057<dd>
3058<p>
3059 Specify the directory from which templates will be copied.
3060 (See the "TEMPLATE DIRECTORY" section of <a href="git-init.html">git-init(1)</a>.)
3061</p>
3062</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3063<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]3064instaweb.browser
3065</dt>
3066<dd>
3067<p>
3068 Specify the program that will be used to browse your working
3069 repository in gitweb. See <a href="git-instaweb.html">git-instaweb(1)</a>.
3070</p>
3071</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3072<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]3073instaweb.httpd
3074</dt>
3075<dd>
3076<p>
3077 The HTTP daemon command-line to start gitweb on your working
3078 repository. See <a href="git-instaweb.html">git-instaweb(1)</a>.
3079</p>
3080</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3081<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]3082instaweb.local
3083</dt>
3084<dd>
3085<p>
3086 If true the web server started by <a href="git-instaweb.html">git-instaweb(1)</a> will
3087 be bound to the local IP (127.0.0.1).
3088</p>
3089</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3090<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]3091instaweb.modulepath
3092</dt>
3093<dd>
3094<p>
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]3095 The default module path for <a href="git-instaweb.html">git-instaweb(1)</a> to use
3096 instead of /usr/lib/apache2/modules. Only used if httpd
3097 is Apache.
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]3098</p>
3099</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3100<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]3101instaweb.port
3102</dt>
3103<dd>
3104<p>
3105 The port number to bind the gitweb httpd to. See
3106 <a href="git-instaweb.html">git-instaweb(1)</a>.
3107</p>
3108</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3109<dt class="hdlist1">
Junio C Hamanoe5bf6c12009-02-07 21:43:10[diff] [blame]3110interactive.singlekey
3111</dt>
3112<dd>
3113<p>
Junio C Hamano27a128b2009-08-13 01:23:00[diff] [blame]3114 In interactive commands, allow the user to provide one-letter
Junio C Hamanoe5bf6c12009-02-07 21:43:10[diff] [blame]3115 input with a single key (i.e., without hitting enter).
3116 Currently this is used only by the <tt>--patch</tt> mode of
3117 <a href="git-add.html">git-add(1)</a>. Note that this setting is silently
3118 ignored if portable keystroke input is not available.
3119</p>
3120</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3121<dt class="hdlist1">
Junio C Hamanob713ff12008-05-24 01:12:30[diff] [blame]3122log.date
3123</dt>
3124<dd>
3125<p>
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]3126 Set the default date-time mode for the <em>log</em> command.
3127 Setting a value for log.date is similar to using <em>git log</em>'s
3128 <tt>--date</tt> option. Possible values are <tt>relative</tt>, <tt>local</tt>,
3129 <tt>default</tt>, <tt>iso</tt>, <tt>rfc</tt>, and <tt>short</tt>; see <a href="git-log.html">git-log(1)</a>
3130 for details.
Junio C Hamanob713ff12008-05-24 01:12:30[diff] [blame]3131</p>
3132</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3133<dt class="hdlist1">
Junio C Hamanocb39aea2010-05-09 07:24:48[diff] [blame]3134log.decorate
3135</dt>
3136<dd>
3137<p>
3138 Print out the ref names of any commits that are shown by the log
3139 command. If <em>short</em> is specified, the ref name prefixes <em>refs/heads/</em>,
3140 <em>refs/tags/</em> and <em>refs/remotes/</em> will not be printed. If <em>full</em> is
3141 specified, the full ref name (including prefix) will be printed.
3142 This is the same as the log commands <em>--decorate</em> option.
3143</p>
3144</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3145<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3146log.showroot
3147</dt>
3148<dd>
3149<p>
3150 If true, the initial commit will be shown as a big creation event.
3151 This is equivalent to a diff against an empty tree.
3152 Tools like <a href="git-log.html">git-log(1)</a> or <a href="git-whatchanged.html">git-whatchanged(1)</a>, which
3153 normally hide the root commit will now show it. True by default.
3154</p>
3155</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3156<dt class="hdlist1">
Junio C Hamano8bc410e2009-02-15 10:38:19[diff] [blame]3157mailmap.file
3158</dt>
3159<dd>
3160<p>
3161 The location of an augmenting mailmap file. The default
3162 mailmap, located in the root of the repository, is loaded
3163 first, then the mailmap file pointed to by this variable.
3164 The location of the mailmap file may be in a repository
3165 subdirectory, or somewhere outside of the repository itself.
3166 See <a href="git-shortlog.html">git-shortlog(1)</a> and <a href="git-blame.html">git-blame(1)</a>.
3167</p>
3168</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3169<dt class="hdlist1">
Junio C Hamano8b588d52008-03-15 09:48:37[diff] [blame]3170man.viewer
3171</dt>
3172<dd>
3173<p>
3174 Specify the programs that may be used to display help in the
3175 <em>man</em> format. See <a href="git-help.html">git-help(1)</a>.
3176</p>
3177</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3178<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3179man.&lt;tool&gt;.cmd
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3180</dt>
3181<dd>
3182<p>
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3183 Specify the command to invoke the specified man viewer. The
3184 specified command is evaluated in shell with the man page
3185 passed as argument. (See <a href="git-help.html">git-help(1)</a>.)
3186</p>
3187</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3188<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3189man.&lt;tool&gt;.path
3190</dt>
3191<dd>
3192<p>
3193 Override the path for the given tool that may be used to
3194 display help in the <em>man</em> format. See <a href="git-help.html">git-help(1)</a>.
3195</p>
3196</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3197<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3198merge.conflictstyle
3199</dt>
3200<dd>
3201<p>
3202 Specify the style in which conflicted hunks are written out to
3203 working tree files upon merge. The default is "merge", which
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]3204 shows a <tt>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</tt> conflict marker, changes made by one side,
3205 a <tt>=======</tt> marker, changes made by the other side, and then
3206 a <tt>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</tt> marker. An alternate style, "diff3", adds a <tt>|||||||</tt>
3207 marker and the original text before the <tt>=======</tt> marker.
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3208</p>
3209</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3210<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3211merge.log
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3212</dt>
3213<dd>
3214<p>
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]3215 In addition to branch names, populate the log message with at
3216 most the specified number of one-line descriptions from the
3217 actual commits that are being merged. Defaults to false, and
Junio C Hamano7165bf72011-01-04 22:06:18[diff] [blame]3218 true is a synonym for 20.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3219</p>
3220</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3221<dt class="hdlist1">
Junio C Hamano2fbcd212008-05-14 22:26:07[diff] [blame]3222merge.renameLimit
3223</dt>
3224<dd>
3225<p>
3226 The number of files to consider when performing rename detection
3227 during a merge; if not specified, defaults to the value of
3228 diff.renameLimit.
3229</p>
3230</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3231<dt class="hdlist1">
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]3232merge.renormalize
3233</dt>
3234<dd>
3235<p>
3236 Tell git that canonical representation of files in the
3237 repository has changed over time (e.g. earlier commits record
3238 text files with CRLF line endings, but recent ones use LF line
3239 endings). In such a repository, git can convert the data
3240 recorded in commits to a canonical form before performing a
3241 merge to reduce unnecessary conflicts. For more information,
3242 see section "Merging branches with differing checkin/checkout
3243 attributes" in <a href="gitattributes.html">gitattributes(5)</a>.
3244</p>
3245</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3246<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3247merge.stat
3248</dt>
3249<dd>
3250<p>
3251 Whether to print the diffstat between ORIG_HEAD and the merge result
3252 at the end of the merge. True by default.
3253</p>
3254</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3255<dt class="hdlist1">
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]3256merge.tool
3257</dt>
3258<dd>
3259<p>
3260 Controls which merge resolution program is used by
Junio C Hamanod2c978f2011-03-20 19:42:22[diff] [blame]3261 <a href="git-mergetool.html">git-mergetool(1)</a>. Valid built-in values are: "araxis",
3262 "bc3", "diffuse", "ecmerge", "emerge", "gvimdiff", "kdiff3", "meld",
3263 "opendiff", "p4merge", "tkdiff", "tortoisemerge", "vimdiff"
3264 and "xxdiff". Any other value is treated is custom merge tool
Junio C Hamanocb1c44f2008-08-06 06:19:33[diff] [blame]3265 and there must be a corresponding mergetool.&lt;tool&gt;.cmd option.
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]3266</p>
3267</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3268<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3269merge.verbosity
3270</dt>
3271<dd>
3272<p>
3273 Controls the amount of output shown by the recursive merge
3274 strategy. Level 0 outputs nothing except a final error
3275 message if conflicts were detected. Level 1 outputs only
3276 conflicts, 2 outputs conflicts and file changes. Level 5 and
3277 above outputs debugging information. The default is level 2.
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]3278 Can be overridden by the <em>GIT_MERGE_VERBOSITY</em> environment variable.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3279</p>
3280</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3281<dt class="hdlist1">
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]3282merge.&lt;driver&gt;.name
3283</dt>
3284<dd>
3285<p>
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]3286 Defines a human-readable name for a custom low-level
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]3287 merge driver. See <a href="gitattributes.html">gitattributes(5)</a> for details.
3288</p>
3289</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3290<dt class="hdlist1">
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]3291merge.&lt;driver&gt;.driver
3292</dt>
3293<dd>
3294<p>
3295 Defines the command that implements a custom low-level
3296 merge driver. See <a href="gitattributes.html">gitattributes(5)</a> for details.
3297</p>
3298</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3299<dt class="hdlist1">
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]3300merge.&lt;driver&gt;.recursive
3301</dt>
3302<dd>
3303<p>
3304 Names a low-level merge driver to be used when
3305 performing an internal merge between common ancestors.
3306 See <a href="gitattributes.html">gitattributes(5)</a> for details.
3307</p>
3308</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3309<dt class="hdlist1">
Junio C Hamano1fbbbc12007-12-18 07:01:27[diff] [blame]3310mergetool.&lt;tool&gt;.path
3311</dt>
3312<dd>
3313<p>
3314 Override the path for the given tool. This is useful in case
3315 your tool is not in the PATH.
3316</p>
3317</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3318<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]3319mergetool.&lt;tool&gt;.cmd
3320</dt>
3321<dd>
3322<p>
3323 Specify the command to invoke the specified merge tool. The
3324 specified command is evaluated in shell with the following
3325 variables available: <em>BASE</em> is the name of a temporary file
3326 containing the common base of the files to be merged, if available;
3327 <em>LOCAL</em> is the name of a temporary file containing the contents of
3328 the file on the current branch; <em>REMOTE</em> is the name of a temporary
3329 file containing the contents of the file from the branch being
3330 merged; <em>MERGED</em> contains the name of the file to which the merge
3331 tool should write the results of a successful merge.
3332</p>
3333</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3334<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]3335mergetool.&lt;tool&gt;.trustExitCode
3336</dt>
3337<dd>
3338<p>
3339 For a custom merge command, specify whether the exit code of
3340 the merge command can be used to determine whether the merge was
3341 successful. If this is not set to true then the merge target file
3342 timestamp is checked and the merge assumed to have been successful
3343 if the file has been updated, otherwise the user is prompted to
3344 indicate the success of the merge.
3345</p>
3346</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3347<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]3348mergetool.keepBackup
3349</dt>
3350<dd>
3351<p>
3352 After performing a merge, the original file with conflict markers
3353 can be saved as a file with a <tt>.orig</tt> extension. If this variable
3354 is set to <tt>false</tt> then this file is not preserved. Defaults to
3355 <tt>true</tt> (i.e. keep the backup files).
3356</p>
3357</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3358<dt class="hdlist1">
Junio C Hamano10b7a342009-01-01 22:05:17[diff] [blame]3359mergetool.keepTemporaries
3360</dt>
3361<dd>
3362<p>
3363 When invoking a custom merge tool, git uses a set of temporary
3364 files to pass to the tool. If the tool returns an error and this
3365 variable is set to <tt>true</tt>, then these temporary files will be
3366 preserved, otherwise they will be removed after the tool has
3367 exited. Defaults to <tt>false</tt>.
3368</p>
3369</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3370<dt class="hdlist1">
Junio C Hamano10b7a342009-01-01 22:05:17[diff] [blame]3371mergetool.prompt
3372</dt>
3373<dd>
3374<p>
3375 Prompt before each invocation of the merge resolution program.
3376</p>
3377</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3378<dt class="hdlist1">
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3379notes.displayRef
3380</dt>
3381<dd>
3382<p>
3383 The (fully qualified) refname from which to show notes when
3384 showing commit messages. The value of this variable can be set
3385 to a glob, in which case notes from all matching refs will be
3386 shown. You may also specify this configuration variable
3387 several times. A warning will be issued for refs that do not
3388 exist, but a glob that does not match any refs is silently
3389 ignored.
3390</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3391<div class="paragraph"><p>This setting can be overridden with the <tt>GIT_NOTES_DISPLAY_REF</tt>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3392environment variable, which must be a colon separated list of refs or
3393globs.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3394<div class="paragraph"><p>The effective value of "core.notesRef" (possibly overridden by
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3395GIT_NOTES_REF) is also implicitly added to the list of refs to be
3396displayed.</p></div>
3397</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3398<dt class="hdlist1">
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3399notes.rewrite.&lt;command&gt;
3400</dt>
3401<dd>
3402<p>
3403 When rewriting commits with &lt;command&gt; (currently <tt>amend</tt> or
3404 <tt>rebase</tt>) and this variable is set to <tt>true</tt>, git
3405 automatically copies your notes from the original to the
3406 rewritten commit. Defaults to <tt>true</tt>, but see
3407 "notes.rewriteRef" below.
3408</p>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3409</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3410<dt class="hdlist1">
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3411notes.rewriteMode
3412</dt>
3413<dd>
3414<p>
3415 When copying notes during a rewrite (see the
3416 "notes.rewrite.&lt;command&gt;" option), determines what to do if
3417 the target commit already has a note. Must be one of
3418 <tt>overwrite</tt>, <tt>concatenate</tt>, or <tt>ignore</tt>. Defaults to
3419 <tt>concatenate</tt>.
3420</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3421<div class="paragraph"><p>This setting can be overridden with the <tt>GIT_NOTES_REWRITE_MODE</tt>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3422environment variable.</p></div>
3423</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3424<dt class="hdlist1">
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3425notes.rewriteRef
3426</dt>
3427<dd>
3428<p>
3429 When copying notes during a rewrite, specifies the (fully
3430 qualified) ref whose notes should be copied. The ref may be a
3431 glob, in which case notes in all matching refs will be copied.
3432 You may also specify this configuration several times.
3433</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3434<div class="paragraph"><p>Does not have a default value; you must configure this variable to
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3435enable note rewriting.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3436<div class="paragraph"><p>This setting can be overridden with the <tt>GIT_NOTES_REWRITE_REF</tt>
Junio C Hamano2b3ee5d2010-05-08 05:41:18[diff] [blame]3437environment variable, which must be a colon separated list of refs or
3438globs.</p></div>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]3439</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3440<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3441pack.window
3442</dt>
3443<dd>
3444<p>
3445 The size of the window used by <a href="git-pack-objects.html">git-pack-objects(1)</a> when no
3446 window size is given on the command line. Defaults to 10.
3447</p>
3448</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3449<dt class="hdlist1">
Junio C Hamano91d44c52007-05-09 07:16:07[diff] [blame]3450pack.depth
3451</dt>
3452<dd>
3453<p>
3454 The maximum delta depth used by <a href="git-pack-objects.html">git-pack-objects(1)</a> when no
3455 maximum depth is given on the command line. Defaults to 50.
3456</p>
3457</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3458<dt class="hdlist1">
Junio C Hamano235d53f2007-07-13 00:25:15[diff] [blame]3459pack.windowMemory
3460</dt>
3461<dd>
3462<p>
3463 The window memory size limit used by <a href="git-pack-objects.html">git-pack-objects(1)</a>
3464 when no limit is given on the command line. The value can be
3465 suffixed with "k", "m", or "g". Defaults to 0, meaning no
3466 limit.
3467</p>
3468</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3469<dt class="hdlist1">
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]3470pack.compression
3471</dt>
3472<dd>
3473<p>
3474 An integer -1..9, indicating the compression level for objects
3475 in a pack file. -1 is the zlib default. 0 means no
3476 compression, and 1..9 are various speed/size tradeoffs, 9 being
3477 slowest. If not set, defaults to core.compression. If that is
Junio C Hamano2e72a942007-11-21 08:54:42[diff] [blame]3478 not set, defaults to -1, the zlib default, which is "a default
3479 compromise between speed and compression (currently equivalent
3480 to level 6)."
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]3481</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3482<div class="paragraph"><p>Note that changing the compression level will not automatically recompress
Junio C Hamano657fd8a2010-10-07 00:01:24[diff] [blame]3483all existing objects. You can force recompression by passing the -F option
3484to <a href="git-repack.html">git-repack(1)</a>.</p></div>
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]3485</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3486<dt class="hdlist1">
Junio C Hamano679d22d2007-06-02 21:13:44[diff] [blame]3487pack.deltaCacheSize
3488</dt>
3489<dd>
3490<p>
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]3491 The maximum memory in bytes used for caching deltas in
Junio C Hamano9f883862009-08-11 06:23:52[diff] [blame]3492 <a href="git-pack-objects.html">git-pack-objects(1)</a> before writing them out to a pack.
3493 This cache is used to speed up the writing object phase by not
3494 having to recompute the final delta result once the best match
3495 for all objects is found. Repacking large repositories on machines
3496 which are tight with memory might be badly impacted by this though,
3497 especially if this cache pushes the system into swapping.
3498 A value of 0 means no limit. The smallest size of 1 byte may be
3499 used to virtually disable this cache. Defaults to 256 MiB.
Junio C Hamano679d22d2007-06-02 21:13:44[diff] [blame]3500</p>
3501</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3502<dt class="hdlist1">
Junio C Hamano679d22d2007-06-02 21:13:44[diff] [blame]3503pack.deltaCacheLimit
3504</dt>
3505<dd>
3506<p>
Junio C Hamano58155b42007-09-15 07:46:14[diff] [blame]3507 The maximum size of a delta, that is cached in
Junio C Hamano9f883862009-08-11 06:23:52[diff] [blame]3508 <a href="git-pack-objects.html">git-pack-objects(1)</a>. This cache is used to speed up the
3509 writing object phase by not having to recompute the final delta
3510 result once the best match for all objects is found. Defaults to 1000.
Junio C Hamano679d22d2007-06-02 21:13:44[diff] [blame]3511</p>
3512</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3513<dt class="hdlist1">
Junio C Hamano58155b42007-09-15 07:46:14[diff] [blame]3514pack.threads
3515</dt>
3516<dd>
3517<p>
3518 Specifies the number of threads to spawn when searching for best
3519 delta matches. This requires that <a href="git-pack-objects.html">git-pack-objects(1)</a>
3520 be compiled with pthreads otherwise this option is ignored with a
3521 warning. This is meant to reduce packing time on multiprocessor
3522 machines. The required amount of memory for the delta search window
3523 is however multiplied by the number of threads.
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3524 Specifying 0 will cause git to auto-detect the number of CPU&#8217;s
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]3525 and set the number of threads accordingly.
Junio C Hamano58155b42007-09-15 07:46:14[diff] [blame]3526</p>
3527</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3528<dt class="hdlist1">
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]3529pack.indexVersion
3530</dt>
3531<dd>
3532<p>
3533 Specify the default pack index version. Valid values are 1 for
3534 legacy pack index used by Git versions prior to 1.5.2, and 2 for
3535 the new pack index with capabilities for packs larger than 4 GB
3536 as well as proper protection against the repacking of corrupted
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]3537 packs. Version 2 is the default. Note that version 2 is enforced
3538 and this config option ignored whenever the corresponding pack is
3539 larger than 2 GB.
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]3540</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3541<div class="paragraph"><p>If you have an old git that does not understand the version 2 <tt>&#42;.idx</tt> file,
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]3542cloning or fetching over a non native protocol (e.g. "http" and "rsync")
3543that will copy both <tt>&#42;.pack</tt> file and corresponding <tt>&#42;.idx</tt> file from the
3544other side may give you a repository that cannot be accessed with your
3545older version of git. If the <tt>&#42;.pack</tt> file is smaller than 2 GB, however,
3546you can use <a href="git-index-pack.html">git-index-pack(1)</a> on the *.pack file to regenerate
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3547the <tt>&#42;.idx</tt> file.</p></div>
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]3548</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3549<dt class="hdlist1">
Junio C Hamano09a926d2008-03-13 07:55:29[diff] [blame]3550pack.packSizeLimit
3551</dt>
3552<dd>
3553<p>
Junio C Hamano4d979582010-02-04 06:27:29[diff] [blame]3554 The maximum size of a pack. This setting only affects
3555 packing to a file when repacking, i.e. the git:// protocol
3556 is unaffected. It can be overridden by the <tt>--max-pack-size</tt>
3557 option of <a href="git-repack.html">git-repack(1)</a>. The minimum size allowed is
3558 limited to 1 MiB. The default is unlimited.
3559 Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are
3560 supported.
Junio C Hamano09a926d2008-03-13 07:55:29[diff] [blame]3561</p>
3562</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3563<dt class="hdlist1">
Junio C Hamano9e96a1a2008-08-16 10:23:18[diff] [blame]3564pager.&lt;cmd&gt;
3565</dt>
3566<dd>
3567<p>
Junio C Hamano788eeba2010-12-08 22:50:43[diff] [blame]3568 If the value is boolean, turns on or off pagination of the
3569 output of a particular git subcommand when writing to a tty.
3570 Otherwise, turns on pagination for the subcommand using the
3571 pager specified by the value of <tt>pager.&lt;cmd&gt;</tt>. If <tt>--paginate</tt>
3572 or <tt>--no-pager</tt> is specified on the command line, it takes
3573 precedence over this option. To disable pagination for all
3574 commands, set <tt>core.pager</tt> or <tt>GIT_PAGER</tt> to <tt>cat</tt>.
Junio C Hamano9e96a1a2008-08-16 10:23:18[diff] [blame]3575</p>
3576</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3577<dt class="hdlist1">
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]3578pretty.&lt;name&gt;
3579</dt>
3580<dd>
3581<p>
3582 Alias for a --pretty= format string, as specified in
3583 <a href="git-log.html">git-log(1)</a>. Any aliases defined here can be used just
3584 as the built-in pretty formats could. For example,
3585 running <tt>git config pretty.changelog "format:&#42; %H %s"</tt>
3586 would cause the invocation <tt>git log --pretty=changelog</tt>
3587 to be equivalent to running <tt>git log "--pretty=format:&#42; %H %s"</tt>.
3588 Note that an alias with the same name as a built-in format
3589 will be silently ignored.
3590</p>
3591</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3592<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3593pull.octopus
3594</dt>
3595<dd>
3596<p>
3597 The default merge strategy to use when pulling multiple branches
3598 at once.
3599</p>
3600</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3601<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3602pull.twohead
3603</dt>
3604<dd>
3605<p>
3606 The default merge strategy to use when pulling a single branch.
3607</p>
3608</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3609<dt class="hdlist1">
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]3610push.default
3611</dt>
3612<dd>
3613<p>
3614 Defines the action git push should take if no refspec is given
3615 on the command line, no refspec is configured in the remote, and
3616 no refspec is implied by any of the options given on the command
Junio C Hamano0706c802009-03-30 22:34:19[diff] [blame]3617 line. Possible values are:
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]3618</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3619<div class="ulist"><ul>
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]3620<li>
3621<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3622<tt>nothing</tt> - do not push anything.
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]3623</p>
3624</li>
3625<li>
3626<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3627<tt>matching</tt> - push all matching branches.
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]3628 All branches having the same name in both ends are considered to be
Junio C Hamano0706c802009-03-30 22:34:19[diff] [blame]3629 matching. This is the default.
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]3630</p>
3631</li>
3632<li>
3633<p>
Junio C Hamano63c2bc92011-02-28 06:41:28[diff] [blame]3634<tt>upstream</tt> - push the current branch to its upstream branch.
3635</p>
3636</li>
3637<li>
3638<p>
3639<tt>tracking</tt> - deprecated synonym for <tt>upstream</tt>.
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]3640</p>
3641</li>
3642<li>
3643<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]3644<tt>current</tt> - push the current branch to a branch of the same name.
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]3645</p>
3646</li>
3647</ul></div>
3648</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3649<dt class="hdlist1">
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]3650rebase.stat
3651</dt>
3652<dd>
3653<p>
3654 Whether to show a diffstat of what changed upstream since the last
3655 rebase. False by default.
3656</p>
3657</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3658<dt class="hdlist1">
Junio C Hamano075ae872010-09-01 18:43:07[diff] [blame]3659rebase.autosquash
3660</dt>
3661<dd>
3662<p>
3663 If set to true enable <em>--autosquash</em> option by default.
3664</p>
3665</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3666<dt class="hdlist1">
Junio C Hamano621e1232009-10-26 05:16:47[diff] [blame]3667receive.autogc
3668</dt>
3669<dd>
3670<p>
3671 By default, git-receive-pack will run "git-gc --auto" after
3672 receiving data from git-push and updating refs. You can stop
3673 it by setting this variable to false.
3674</p>
3675</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3676<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3677receive.fsckObjects
3678</dt>
3679<dd>
3680<p>
3681 If it is set to true, git-receive-pack will check all received
3682 objects. It will abort in the case of a malformed object or a
3683 broken link. The result of an abort are only dangling objects.
3684 Defaults to false.
3685</p>
3686</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3687<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3688receive.unpackLimit
3689</dt>
3690<dd>
3691<p>
3692 If the number of objects received in a push is below this
3693 limit then the objects will be unpacked into loose object
3694 files. However if the number of received objects equals or
3695 exceeds this limit then the received pack will be stored as
3696 a pack, after adding any missing delta bases. Storing the
3697 pack from a push can make the push operation complete faster,
3698 especially on slow filesystems. If not set, the value of
3699 <tt>transfer.unpackLimit</tt> is used instead.
3700</p>
3701</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3702<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3703receive.denyDeletes
3704</dt>
3705<dd>
3706<p>
3707 If set to true, git-receive-pack will deny a ref update that deletes
3708 the ref. Use this to prevent such a ref deletion via a push.
3709</p>
3710</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3711<dt class="hdlist1">
Junio C Hamanob4448a82010-07-26 09:02:32[diff] [blame]3712receive.denyDeleteCurrent
3713</dt>
3714<dd>
3715<p>
3716 If set to true, git-receive-pack will deny a ref update that
3717 deletes the currently checked out branch of a non-bare repository.
3718</p>
3719</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3720<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3721receive.denyCurrentBranch
3722</dt>
3723<dd>
3724<p>
Junio C Hamanoe97d5772010-05-19 08:13:58[diff] [blame]3725 If set to true or "refuse", git-receive-pack will deny a ref update
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3726 to the currently checked out branch of a non-bare repository.
3727 Such a push is potentially dangerous because it brings the HEAD
3728 out of sync with the index and working tree. If set to "warn",
3729 print a warning of such a push to stderr, but allow the push to
3730 proceed. If set to false or "ignore", allow such pushes with no
Junio C Hamanoafb395b2010-03-17 22:16:15[diff] [blame]3731 message. Defaults to "refuse".
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3732</p>
3733</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3734<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3735receive.denyNonFastForwards
3736</dt>
3737<dd>
3738<p>
3739 If set to true, git-receive-pack will deny a ref update which is
Junio C Hamano3f680f32009-11-16 02:10:54[diff] [blame]3740 not a fast-forward. Use this to prevent such an update via a push,
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3741 even if that push is forced. This configuration variable is
3742 set when initializing a shared repository.
3743</p>
3744</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3745<dt class="hdlist1">
Junio C Hamano621e1232009-10-26 05:16:47[diff] [blame]3746receive.updateserverinfo
3747</dt>
3748<dd>
3749<p>
3750 If set to true, git-receive-pack will run git-update-server-info
3751 after receiving data from git-push and updating refs.
3752</p>
3753</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3754<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3755remote.&lt;name&gt;.url
3756</dt>
3757<dd>
3758<p>
3759 The URL of a remote repository. See <a href="git-fetch.html">git-fetch(1)</a> or
3760 <a href="git-push.html">git-push(1)</a>.
3761</p>
3762</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3763<dt class="hdlist1">
Junio C Hamano0e88f3e2009-06-21 08:03:25[diff] [blame]3764remote.&lt;name&gt;.pushurl
3765</dt>
3766<dd>
3767<p>
3768 The push URL of a remote repository. See <a href="git-push.html">git-push(1)</a>.
3769</p>
3770</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3771<dt class="hdlist1">
Junio C Hamano58256872007-12-04 08:31:13[diff] [blame]3772remote.&lt;name&gt;.proxy
3773</dt>
3774<dd>
3775<p>
3776 For remotes that require curl (http, https and ftp), the URL to
3777 the proxy to use for that remote. Set to the empty string to
3778 disable proxying for that remote.
3779</p>
3780</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3781<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3782remote.&lt;name&gt;.fetch
3783</dt>
3784<dd>
3785<p>
3786 The default set of "refspec" for <a href="git-fetch.html">git-fetch(1)</a>. See
3787 <a href="git-fetch.html">git-fetch(1)</a>.
3788</p>
3789</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3790<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3791remote.&lt;name&gt;.push
3792</dt>
3793<dd>
3794<p>
3795 The default set of "refspec" for <a href="git-push.html">git-push(1)</a>. See
3796 <a href="git-push.html">git-push(1)</a>.
3797</p>
3798</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3799<dt class="hdlist1">
Junio C Hamano47d68a52008-05-06 06:35:40[diff] [blame]3800remote.&lt;name&gt;.mirror
3801</dt>
3802<dd>
3803<p>
3804 If true, pushing to this remote will automatically behave
3805 as if the <tt>--mirror</tt> option was given on the command line.
3806</p>
3807</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3808<dt class="hdlist1">
Junio C Hamano118d2772007-02-21 20:24:10[diff] [blame]3809remote.&lt;name&gt;.skipDefaultUpdate
3810</dt>
3811<dd>
3812<p>
3813 If true, this remote will be skipped by default when updating
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]3814 using <a href="git-fetch.html">git-fetch(1)</a> or the <tt>update</tt> subcommand of
3815 <a href="git-remote.html">git-remote(1)</a>.
3816</p>
3817</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3818<dt class="hdlist1">
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]3819remote.&lt;name&gt;.skipFetchAll
3820</dt>
3821<dd>
3822<p>
3823 If true, this remote will be skipped by default when updating
3824 using <a href="git-fetch.html">git-fetch(1)</a> or the <tt>update</tt> subcommand of
3825 <a href="git-remote.html">git-remote(1)</a>.
Junio C Hamano118d2772007-02-21 20:24:10[diff] [blame]3826</p>
3827</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3828<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3829remote.&lt;name&gt;.receivepack
3830</dt>
3831<dd>
3832<p>
3833 The default program to execute on the remote side when pushing. See
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]3834 option --receive-pack of <a href="git-push.html">git-push(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3835</p>
3836</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3837<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3838remote.&lt;name&gt;.uploadpack
3839</dt>
3840<dd>
3841<p>
3842 The default program to execute on the remote side when fetching. See
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]3843 option --upload-pack of <a href="git-fetch-pack.html">git-fetch-pack(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3844</p>
3845</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3846<dt class="hdlist1">
Junio C Hamano17dde0e2007-02-26 09:50:21[diff] [blame]3847remote.&lt;name&gt;.tagopt
3848</dt>
3849<dd>
3850<p>
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]3851 Setting this value to --no-tags disables automatic tag following when
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]3852 fetching from remote &lt;name&gt;. Setting it to --tags will fetch every
3853 tag from remote &lt;name&gt;, even if they are not reachable from remote
Junio C Hamano075ae872010-09-01 18:43:07[diff] [blame]3854 branch heads. Passing these flags directly to <a href="git-fetch.html">git-fetch(1)</a> can
3855 override this setting. See options --tags and --no-tags of
3856 <a href="git-fetch.html">git-fetch(1)</a>.
Junio C Hamano17dde0e2007-02-26 09:50:21[diff] [blame]3857</p>
3858</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3859<dt class="hdlist1">
Junio C Hamano096dde22009-12-26 23:14:11[diff] [blame]3860remote.&lt;name&gt;.vcs
3861</dt>
3862<dd>
3863<p>
3864 Setting this to a value &lt;vcs&gt; will cause git to interact with
3865 the remote with the git-remote-&lt;vcs&gt; helper.
3866</p>
3867</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3868<dt class="hdlist1">
Junio C Hamano118d2772007-02-21 20:24:10[diff] [blame]3869remotes.&lt;group&gt;
3870</dt>
3871<dd>
3872<p>
3873 The list of remotes which are fetched by "git remote update
3874 &lt;group&gt;". See <a href="git-remote.html">git-remote(1)</a>.
3875</p>
3876</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3877<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3878repack.usedeltabaseoffset
3879</dt>
3880<dd>
3881<p>
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]3882 By default, <a href="git-repack.html">git-repack(1)</a> creates packs that use
3883 delta-base offset. If you need to share your repository with
3884 git older than version 1.4.4, either directly or via a dumb
3885 protocol such as http, then you need to set this option to
3886 "false" and repack. Access from old git versions over the
3887 native protocol are unaffected by this option.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3888</p>
3889</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3890<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3891rerere.autoupdate
3892</dt>
3893<dd>
3894<p>
3895 When set to true, <tt>git-rerere</tt> updates the index with the
3896 resulting contents after it cleanly resolves conflicts using
3897 previously recorded resolution. Defaults to false.
3898</p>
3899</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3900<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]3901rerere.enabled
3902</dt>
3903<dd>
3904<p>
3905 Activate recording of resolved conflicts, so that identical
3906 conflict hunks can be resolved automatically, should they
3907 be encountered again. <a href="git-rerere.html">git-rerere(1)</a> command is by
3908 default enabled if you create <tt>rr-cache</tt> directory under
3909 <tt>$GIT_DIR</tt>, but can be disabled by setting this option to false.
3910</p>
3911</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3912<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3913sendemail.identity
3914</dt>
3915<dd>
3916<p>
3917 A configuration identity. When given, causes values in the
3918 <em>sendemail.&lt;identity&gt;</em> subsection to take precedence over
3919 values in the <em>sendemail</em> section. The default identity is
3920 the value of <em>sendemail.identity</em>.
3921</p>
3922</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3923<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3924sendemail.smtpencryption
3925</dt>
3926<dd>
3927<p>
3928 See <a href="git-send-email.html">git-send-email(1)</a> for description. Note that this
3929 setting is not subject to the <em>identity</em> mechanism.
3930</p>
3931</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3932<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3933sendemail.smtpssl
3934</dt>
3935<dd>
3936<p>
3937 Deprecated alias for <em>sendemail.smtpencryption = ssl</em>.
3938</p>
3939</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3940<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3941sendemail.&lt;identity&gt;.*
3942</dt>
3943<dd>
3944<p>
3945 Identity-specific versions of the <em>sendemail.*</em> parameters
3946 found below, taking precedence over those when the this
3947 identity is selected, through command-line or
3948 <em>sendemail.identity</em>.
3949</p>
3950</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3951<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3952sendemail.aliasesfile
3953</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3954<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3955sendemail.aliasfiletype
3956</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3957<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3958sendemail.bcc
3959</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3960<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3961sendemail.cc
3962</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3963<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3964sendemail.cccmd
3965</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3966<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3967sendemail.chainreplyto
3968</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3969<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3970sendemail.confirm
3971</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3972<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3973sendemail.envelopesender
3974</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3975<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3976sendemail.from
3977</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3978<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3979sendemail.multiedit
3980</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3981<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3982sendemail.signedoffbycc
3983</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3984<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3985sendemail.smtppass
3986</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3987<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3988sendemail.suppresscc
3989</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3990<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3991sendemail.suppressfrom
3992</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3993<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]3994sendemail.to
3995</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3996<dt class="hdlist1">
Junio C Hamanocb39aea2010-05-09 07:24:48[diff] [blame]3997sendemail.smtpdomain
3998</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3999<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]4000sendemail.smtpserver
4001</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4002<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]4003sendemail.smtpserverport
4004</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4005<dt class="hdlist1">
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]4006sendemail.smtpserveroption
4007</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4008<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]4009sendemail.smtpuser
4010</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4011<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]4012sendemail.thread
4013</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4014<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]4015sendemail.validate
4016</dt>
4017<dd>
4018<p>
4019 See <a href="git-send-email.html">git-send-email(1)</a> for description.
4020</p>
4021</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4022<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]4023sendemail.signedoffcc
4024</dt>
4025<dd>
4026<p>
4027 Deprecated alias for <em>sendemail.signedoffbycc</em>.
4028</p>
4029</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4030<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4031showbranch.default
4032</dt>
4033<dd>
4034<p>
4035 The default set of branches for <a href="git-show-branch.html">git-show-branch(1)</a>.
4036 See <a href="git-show-branch.html">git-show-branch(1)</a>.
4037</p>
4038</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4039<dt class="hdlist1">
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]4040status.relativePaths
4041</dt>
4042<dd>
4043<p>
4044 By default, <a href="git-status.html">git-status(1)</a> shows paths relative to the
4045 current directory. Setting this variable to <tt>false</tt> shows paths
4046 relative to the repository root (this was the default for git
4047 prior to v1.5.4).
4048</p>
4049</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4050<dt class="hdlist1">
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]4051status.showUntrackedFiles
4052</dt>
4053<dd>
4054<p>
4055 By default, <a href="git-status.html">git-status(1)</a> and <a href="git-commit.html">git-commit(1)</a> show
4056 files which are not currently tracked by Git. Directories which
4057 contain only untracked files, are shown with the directory name
4058 only. Showing untracked files means that Git needs to lstat() all
4059 all the files in the whole repository, which might be slow on some
4060 systems. So, this variable controls how the commands displays
4061 the untracked files. Possible values are:
4062</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4063<div class="ulist"><ul>
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]4064<li>
4065<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]4066<tt>no</tt> - Show no untracked files.
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]4067</p>
4068</li>
4069<li>
4070<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]4071<tt>normal</tt> - Show untracked files and directories.
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]4072</p>
4073</li>
4074<li>
4075<p>
Junio C Hamano7f9fa862010-10-19 23:51:14[diff] [blame]4076<tt>all</tt> - Show also individual files in untracked directories.
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]4077</p>
4078</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4079</ul></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4080<div class="paragraph"><p>If this variable is not specified, it defaults to <em>normal</em>.
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]4081This variable can be overridden with the -u|--untracked-files option
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4082of <a href="git-status.html">git-status(1)</a> and <a href="git-commit.html">git-commit(1)</a>.</p></div>
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]4083</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4084<dt class="hdlist1">
Junio C Hamanob671fb52010-06-01 05:06:14[diff] [blame]4085status.submodulesummary
4086</dt>
4087<dd>
4088<p>
4089 Defaults to false.
4090 If this is set to a non zero number or true (identical to -1 or an
4091 unlimited number), the submodule summary will be enabled and a
4092 summary of commits for modified submodules will be shown (see
4093 --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>).
4094</p>
4095</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4096<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]4097submodule.&lt;name&gt;.path
4098</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4099<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]4100submodule.&lt;name&gt;.url
4101</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4102<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]4103submodule.&lt;name&gt;.update
4104</dt>
4105<dd>
4106<p>
4107 The path within this project, URL, and the updating strategy
4108 for a submodule. These variables are initially populated
4109 by <em>git submodule init</em>; edit them to override the
4110 URL and other values found in the <tt>.gitmodules</tt> file. See
4111 <a href="git-submodule.html">git-submodule(1)</a> and <a href="gitmodules.html">gitmodules(5)</a> for details.
4112</p>
4113</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4114<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]4115submodule.&lt;name&gt;.fetchRecurseSubmodules
4116</dt>
4117<dd>
4118<p>
4119 This option can be used to enable/disable recursive fetching of this
Junio C Hamano7165bf72011-01-04 22:06:18[diff] [blame]4120 submodule. It can be overridden by using the --[no-]recurse-submodules
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]4121 command line option to "git fetch" and "git pull".
4122 This setting will override that from in the <a href="gitmodules.html">gitmodules(5)</a>
4123 file.
4124</p>
4125</dd>
4126<dt class="hdlist1">
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]4127submodule.&lt;name&gt;.ignore
4128</dt>
4129<dd>
4130<p>
4131 Defines under what circumstances "git status" and the diff family show
4132 a submodule as modified. When set to "all", it will never be considered
4133 modified, "dirty" will ignore all changes to the submodules work tree and
4134 takes only differences between the HEAD of the submodule and the commit
4135 recorded in the superproject into account. "untracked" will additionally
4136 let submodules with modified tracked files in their work tree show up.
4137 Using "none" (the default when this option is not set) also shows
4138 submodules that have untracked files in their work tree as changed.
4139 This setting overrides any setting made in .gitmodules for this submodule,
Junio C Hamanode9745c2010-08-23 17:10:18[diff] [blame]4140 both settings can be overridden on the command line by using the
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]4141 "--ignore-submodules" option.
4142</p>
4143</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4144<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4145tar.umask
4146</dt>
4147<dd>
4148<p>
Junio C Hamanobdebabb2007-08-23 00:25:09[diff] [blame]4149 This variable can be used to restrict the permission bits of
4150 tar archive entries. The default is 0002, which turns off the
4151 world write bit. The special value "user" indicates that the
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4152 archiving user&#8217;s umask will be used instead. See umask(2) and
Junio C Hamanobdebabb2007-08-23 00:25:09[diff] [blame]4153 <a href="git-archive.html">git-archive(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4154</p>
4155</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4156<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4157transfer.unpackLimit
4158</dt>
4159<dd>
4160<p>
4161 When <tt>fetch.unpackLimit</tt> or <tt>receive.unpackLimit</tt> are
4162 not set, the value of this variable is used instead.
4163 The default value is 100.
4164</p>
4165</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4166<dt class="hdlist1">
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]4167url.&lt;base&gt;.insteadOf
4168</dt>
4169<dd>
4170<p>
4171 Any URL that starts with this value will be rewritten to
4172 start, instead, with &lt;base&gt;. In cases where some site serves a
4173 large number of repositories, and serves them with multiple
4174 access methods, and some users need to use different access
4175 methods, this feature allows people to specify any of the
4176 equivalent URLs and have git automatically rewrite the URL to
4177 the best alternative for the particular user, even for a
4178 never-before-seen repository on the site. When more than one
4179 insteadOf strings match a given URL, the longest match is used.
4180</p>
4181</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4182<dt class="hdlist1">
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]4183url.&lt;base&gt;.pushInsteadOf
4184</dt>
4185<dd>
4186<p>
4187 Any URL that starts with this value will not be pushed to;
4188 instead, it will be rewritten to start with &lt;base&gt;, and the
4189 resulting URL will be pushed to. In cases where some site serves
4190 a large number of repositories, and serves them with multiple
4191 access methods, some of which do not allow push, this feature
4192 allows people to specify a pull-only URL and have git
4193 automatically use an appropriate URL to push, even for a
4194 never-before-seen repository on the site. When more than one
4195 pushInsteadOf strings match a given URL, the longest match is
4196 used. If a remote has an explicit pushurl, git will ignore this
4197 setting for that remote.
4198</p>
4199</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4200<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4201user.email
4202</dt>
4203<dd>
4204<p>
4205 Your email address to be recorded in any newly created commits.
Junio C Hamano469d60e2007-04-29 18:30:34[diff] [blame]4206 Can be overridden by the <em>GIT_AUTHOR_EMAIL</em>, <em>GIT_COMMITTER_EMAIL</em>, and
4207 <em>EMAIL</em> environment variables. See <a href="git-commit-tree.html">git-commit-tree(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4208</p>
4209</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4210<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4211user.name
4212</dt>
4213<dd>
4214<p>
4215 Your full name to be recorded in any newly created commits.
4216 Can be overridden by the <em>GIT_AUTHOR_NAME</em> and <em>GIT_COMMITTER_NAME</em>
4217 environment variables. See <a href="git-commit-tree.html">git-commit-tree(1)</a>.
4218</p>
4219</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4220<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4221user.signingkey
4222</dt>
4223<dd>
4224<p>
4225 If <a href="git-tag.html">git-tag(1)</a> is not selecting the key you want it to
4226 automatically when creating a signed tag, you can override the
4227 default selection with this variable. This option is passed
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4228 unchanged to gpg&#8217;s --local-user parameter, so you may specify a key
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4229 using any method that gpg supports.
4230</p>
4231</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4232<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4233web.browser
4234</dt>
4235<dd>
4236<p>
4237 Specify a web browser that may be used by some commands.
4238 Currently only <a href="git-instaweb.html">git-instaweb(1)</a> and <a href="git-help.html">git-help(1)</a>
4239 may use it.
4240</p>
4241</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4242</dl></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4243</div>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]4244<h2 id="_git">GIT</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4245<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4246<div class="paragraph"><p>Part of the <a href="git.html">git(1)</a> suite</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4247</div>
4248<div id="footer">
4249<div id="footer-text">
Junio C Hamano5f3d8392011-03-15 23:33:35[diff] [blame]4250Last updated 2011-03-15 23:30:13 UTC
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4251</div>
4252</div>
4253</body>
4254</html>