Google Git
Sign in
chromium / external / gitster / git-htmldocs / 8401f142a88980c91f3af6f06199e5579c9143c6 / . / git-config.html
blob: 22fe9461872607cb8f0d5e0a37d240650928e667 [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>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5<meta http-equiv="Content-Type" content="application/xhtml+xml; charset=UTF-8" />
6<meta name="generator" content="AsciiDoc 8.6.8" />
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]7<title>git-config(1)</title>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]8<style type="text/css">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]9/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
10
11/* Default font. */
12body {
13 font-family: Georgia,serif;
14}
15
16/* Title font. */
17h1, h2, h3, h4, h5, h6,
18div.title, caption.title,
19thead, p.table.header,
20#toctitle,
21#author, #revnumber, #revdate, #revremark,
22#footer {
23 font-family: Arial,Helvetica,sans-serif;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]24}
25
26body {
27 margin: 1em 5% 1em 5%;
28}
29
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]30a {
31 color: blue;
32 text-decoration: underline;
33}
34a:visited {
35 color: fuchsia;
36}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]37
38em {
39 font-style: italic;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]40 color: navy;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]41}
42
43strong {
44 font-weight: bold;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]45 color: #083194;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]46}
47
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]48h1, h2, h3, h4, h5, h6 {
49 color: #527bbd;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]50 margin-top: 1.2em;
51 margin-bottom: 0.5em;
52 line-height: 1.3;
53}
54
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]55h1, h2, h3 {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]56 border-bottom: 2px solid silver;
57}
58h2 {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]59 padding-top: 0.5em;
60}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]61h3 {
62 float: left;
63}
64h3 + * {
65 clear: left;
66}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]67h5 {
68 font-size: 1.0em;
69}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]70
71div.sectionbody {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]72 margin-left: 0;
73}
74
75hr {
76 border: 1px solid silver;
77}
78
79p {
80 margin-top: 0.5em;
81 margin-bottom: 0.5em;
82}
83
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]84ul, ol, li > p {
85 margin-top: 0;
86}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]87ul > li { color: #aaa; }
88ul > li > * { color: black; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]89
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]90.monospaced, code, pre {
91 font-family: "Courier New", Courier, monospace;
92 font-size: inherit;
93 color: navy;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]94 padding: 0;
95 margin: 0;
96}
97
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]98
99#author {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]100 color: #527bbd;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]101 font-weight: bold;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]102 font-size: 1.1em;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]103}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]104#email {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]105}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]106#revnumber, #revdate, #revremark {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]107}
108
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]109#footer {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]110 font-size: small;
111 border-top: 2px solid silver;
112 padding-top: 0.5em;
113 margin-top: 4.0em;
114}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]115#footer-text {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]116 float: left;
117 padding-bottom: 0.5em;
118}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]119#footer-badges {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]120 float: right;
121 padding-bottom: 0.5em;
122}
123
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]124#preamble {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]125 margin-top: 1.5em;
126 margin-bottom: 1.5em;
127}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]128div.imageblock, div.exampleblock, div.verseblock,
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]129div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
130div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]131 margin-top: 1.0em;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]132 margin-bottom: 1.5em;
133}
134div.admonitionblock {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]135 margin-top: 2.0em;
136 margin-bottom: 2.0em;
137 margin-right: 10%;
138 color: #606060;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]139}
140
141div.content { /* Block element content. */
142 padding: 0;
143}
144
145/* Block element titles. */
146div.title, caption.title {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]147 color: #527bbd;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]148 font-weight: bold;
149 text-align: left;
150 margin-top: 1.0em;
151 margin-bottom: 0.5em;
152}
153div.title + * {
154 margin-top: 0;
155}
156
157td div.title:first-child {
158 margin-top: 0.0em;
159}
160div.content div.title:first-child {
161 margin-top: 0.0em;
162}
163div.content + div.title {
164 margin-top: 0.0em;
165}
166
167div.sidebarblock > div.content {
168 background: #ffffee;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]169 border: 1px solid #dddddd;
170 border-left: 4px solid #f0f0f0;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]171 padding: 0.5em;
172}
173
174div.listingblock > div.content {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]175 border: 1px solid #dddddd;
176 border-left: 5px solid #f0f0f0;
177 background: #f8f8f8;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]178 padding: 0.5em;
179}
180
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]181div.quoteblock, div.verseblock {
182 padding-left: 1.0em;
183 margin-left: 1.0em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]184 margin-right: 10%;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]185 border-left: 5px solid #f0f0f0;
186 color: #888;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]187}
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]188
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]189div.quoteblock > div.attribution {
190 padding-top: 0.5em;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]191 text-align: right;
192}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]193
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]194div.verseblock > pre.content {
195 font-family: inherit;
196 font-size: inherit;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]197}
198div.verseblock > div.attribution {
199 padding-top: 0.75em;
200 text-align: left;
201}
202/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]203div.verseblock + div.attribution {
204 text-align: left;
205}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]206
207div.admonitionblock .icon {
208 vertical-align: top;
209 font-size: 1.1em;
210 font-weight: bold;
211 text-decoration: underline;
212 color: #527bbd;
213 padding-right: 0.5em;
214}
215div.admonitionblock td.content {
216 padding-left: 0.5em;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]217 border-left: 3px solid #dddddd;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]218}
219
220div.exampleblock > div.content {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]221 border-left: 3px solid #dddddd;
222 padding-left: 0.5em;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]223}
224
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]225div.imageblock div.content { padding-left: 0; }
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]226span.image img { border-style: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]227a.image:visited { color: white; }
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]228
229dl {
230 margin-top: 0.8em;
231 margin-bottom: 0.8em;
232}
233dt {
234 margin-top: 0.5em;
235 margin-bottom: 0;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]236 font-style: normal;
237 color: navy;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]238}
239dd > *:first-child {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]240 margin-top: 0.1em;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]241}
242
243ul, ol {
244 list-style-position: outside;
245}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]246ol.arabic {
247 list-style-type: decimal;
248}
249ol.loweralpha {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]250 list-style-type: lower-alpha;
251}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]252ol.upperalpha {
253 list-style-type: upper-alpha;
254}
255ol.lowerroman {
256 list-style-type: lower-roman;
257}
258ol.upperroman {
259 list-style-type: upper-roman;
260}
261
262div.compact ul, div.compact ol,
263div.compact p, div.compact p,
264div.compact div, div.compact div {
265 margin-top: 0.1em;
266 margin-bottom: 0.1em;
267}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]268
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]269tfoot {
270 font-weight: bold;
271}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]272td > div.verse {
273 white-space: pre;
274}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]275
276div.hdlist {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]277 margin-top: 0.8em;
278 margin-bottom: 0.8em;
279}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]280div.hdlist tr {
281 padding-bottom: 15px;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]282}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]283dt.hdlist1.strong, td.hdlist1.strong {
284 font-weight: bold;
285}
286td.hdlist1 {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]287 vertical-align: top;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]288 font-style: normal;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]289 padding-right: 0.8em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]290 color: navy;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]291}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]292td.hdlist2 {
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]293 vertical-align: top;
294}
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]295div.hdlist.compact tr {
296 margin: 0;
297 padding-bottom: 0;
298}
299
300.comment {
301 background: yellow;
302}
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]303
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]304.footnote, .footnoteref {
305 font-size: 0.8em;
306}
307
308span.footnote, span.footnoteref {
309 vertical-align: super;
310}
311
312#footnotes {
313 margin: 20px 0 20px 0;
314 padding: 7px 0 0 0;
315}
316
317#footnotes div.footnote {
318 margin: 0 0 5px 0;
319}
320
321#footnotes hr {
322 border: none;
323 border-top: 1px solid silver;
324 height: 1px;
325 text-align: left;
326 margin-left: 0;
327 width: 20%;
328 min-width: 100px;
329}
330
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]331div.colist td {
332 padding-right: 0.5em;
333 padding-bottom: 0.3em;
334 vertical-align: top;
335}
336div.colist td img {
337 margin-top: 0.3em;
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]338}
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]339
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]340@media print {
341 #footer-badges { display: none; }
342}
343
344#toc {
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]345 margin-bottom: 2.5em;
346}
347
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]348#toctitle {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]349 color: #527bbd;
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]350 font-size: 1.1em;
351 font-weight: bold;
352 margin-top: 1.0em;
353 margin-bottom: 0.1em;
354}
355
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]356div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]357 margin-top: 0;
358 margin-bottom: 0;
359}
360div.toclevel2 {
361 margin-left: 2em;
362 font-size: 0.9em;
363}
364div.toclevel3 {
365 margin-left: 4em;
366 font-size: 0.9em;
367}
368div.toclevel4 {
369 margin-left: 6em;
370 font-size: 0.9em;
371}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]372
373span.aqua { color: aqua; }
374span.black { color: black; }
375span.blue { color: blue; }
376span.fuchsia { color: fuchsia; }
377span.gray { color: gray; }
378span.green { color: green; }
379span.lime { color: lime; }
380span.maroon { color: maroon; }
381span.navy { color: navy; }
382span.olive { color: olive; }
383span.purple { color: purple; }
384span.red { color: red; }
385span.silver { color: silver; }
386span.teal { color: teal; }
387span.white { color: white; }
388span.yellow { color: yellow; }
389
390span.aqua-background { background: aqua; }
391span.black-background { background: black; }
392span.blue-background { background: blue; }
393span.fuchsia-background { background: fuchsia; }
394span.gray-background { background: gray; }
395span.green-background { background: green; }
396span.lime-background { background: lime; }
397span.maroon-background { background: maroon; }
398span.navy-background { background: navy; }
399span.olive-background { background: olive; }
400span.purple-background { background: purple; }
401span.red-background { background: red; }
402span.silver-background { background: silver; }
403span.teal-background { background: teal; }
404span.white-background { background: white; }
405span.yellow-background { background: yellow; }
406
407span.big { font-size: 2em; }
408span.small { font-size: 0.6em; }
409
410span.underline { text-decoration: underline; }
411span.overline { text-decoration: overline; }
412span.line-through { text-decoration: line-through; }
413
414div.unbreakable { page-break-inside: avoid; }
415
416
417/*
418 * xhtml11 specific
419 *
420 * */
421
422div.tableblock {
423 margin-top: 1.0em;
424 margin-bottom: 1.5em;
425}
426div.tableblock > table {
427 border: 3px solid #527bbd;
428}
429thead, p.table.header {
430 font-weight: bold;
431 color: #527bbd;
432}
433p.table {
434 margin-top: 0;
435}
436/* Because the table frame attribute is overriden by CSS in most browsers. */
437div.tableblock > table[frame="void"] {
438 border-style: none;
439}
440div.tableblock > table[frame="hsides"] {
441 border-left-style: none;
442 border-right-style: none;
443}
444div.tableblock > table[frame="vsides"] {
445 border-top-style: none;
446 border-bottom-style: none;
447}
448
449
450/*
451 * html5 specific
452 *
453 * */
454
455table.tableblock {
456 margin-top: 1.0em;
457 margin-bottom: 1.5em;
458}
459thead, p.tableblock.header {
460 font-weight: bold;
461 color: #527bbd;
462}
463p.tableblock {
464 margin-top: 0;
465}
466table.tableblock {
467 border-width: 3px;
468 border-spacing: 0px;
469 border-style: solid;
470 border-color: #527bbd;
471 border-collapse: collapse;
472}
473th.tableblock, td.tableblock {
474 border-width: 1px;
475 padding: 4px;
476 border-style: solid;
477 border-color: #527bbd;
478}
479
480table.tableblock.frame-topbot {
481 border-left-style: hidden;
482 border-right-style: hidden;
483}
484table.tableblock.frame-sides {
485 border-top-style: hidden;
486 border-bottom-style: hidden;
487}
488table.tableblock.frame-none {
489 border-style: hidden;
490}
491
492th.tableblock.halign-left, td.tableblock.halign-left {
493 text-align: left;
494}
495th.tableblock.halign-center, td.tableblock.halign-center {
496 text-align: center;
497}
498th.tableblock.halign-right, td.tableblock.halign-right {
499 text-align: right;
500}
501
502th.tableblock.valign-top, td.tableblock.valign-top {
503 vertical-align: top;
504}
505th.tableblock.valign-middle, td.tableblock.valign-middle {
506 vertical-align: middle;
507}
508th.tableblock.valign-bottom, td.tableblock.valign-bottom {
509 vertical-align: bottom;
510}
511
512
513/*
514 * manpage specific
515 *
516 * */
517
518body.manpage h1 {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]519 padding-top: 0.5em;
520 padding-bottom: 0.5em;
521 border-top: 2px solid silver;
522 border-bottom: 2px solid silver;
523}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]524body.manpage h2 {
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]525 border-style: none;
526}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]527body.manpage div.sectionbody {
528 margin-left: 3em;
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]529}
530
531@media print {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]532 body.manpage div#toc { display: none; }
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]533}
534
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]535
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]536</style>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]537<script type="text/javascript">
538/*<![CDATA[*/
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]539var asciidoc = { // Namespace.
540
541/////////////////////////////////////////////////////////////////////
542// Table Of Contents generator
543/////////////////////////////////////////////////////////////////////
544
545/* Author: Mihai Bazon, September 2002
546 * http://students.infoiasi.ro/~mishoo
547 *
548 * Table Of Content generator
549 * Version: 0.4
550 *
551 * Feel free to use this script under the terms of the GNU General Public
552 * License, as long as you do not remove or alter this notice.
553 */
554
555 /* modified by Troy D. Hanson, September 2006. License: GPL */
556 /* modified by Stuart Rackham, 2006, 2009. License: GPL */
557
558// toclevels = 1..4.
559toc: function (toclevels) {
560
561 function getText(el) {
562 var text = "";
563 for (var i = el.firstChild; i != null; i = i.nextSibling) {
564 if (i.nodeType == 3 /* Node.TEXT_NODE */) // IE doesn't speak constants.
565 text += i.data;
566 else if (i.firstChild != null)
567 text += getText(i);
568 }
569 return text;
570 }
571
572 function TocEntry(el, text, toclevel) {
573 this.element = el;
574 this.text = text;
575 this.toclevel = toclevel;
576 }
577
578 function tocEntries(el, toclevels) {
579 var result = new Array;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]580 var re = new RegExp('[hH]([1-'+(toclevels+1)+'])');
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]581 // Function that scans the DOM tree for header elements (the DOM2
582 // nodeIterator API would be a better technique but not supported by all
583 // browsers).
584 var iterate = function (el) {
585 for (var i = el.firstChild; i != null; i = i.nextSibling) {
586 if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
587 var mo = re.exec(i.tagName);
588 if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
589 result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
590 }
591 iterate(i);
592 }
593 }
594 }
595 iterate(el);
596 return result;
597 }
598
599 var toc = document.getElementById("toc");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]600 if (!toc) {
601 return;
602 }
603
604 // Delete existing TOC entries in case we're reloading the TOC.
605 var tocEntriesToRemove = [];
606 var i;
607 for (i = 0; i < toc.childNodes.length; i++) {
608 var entry = toc.childNodes[i];
609 if (entry.nodeName.toLowerCase() == 'div'
610 && entry.getAttribute("class")
611 && entry.getAttribute("class").match(/^toclevel/))
612 tocEntriesToRemove.push(entry);
613 }
614 for (i = 0; i < tocEntriesToRemove.length; i++) {
615 toc.removeChild(tocEntriesToRemove[i]);
616 }
617
618 // Rebuild TOC entries.
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]619 var entries = tocEntries(document.getElementById("content"), toclevels);
620 for (var i = 0; i < entries.length; ++i) {
621 var entry = entries[i];
622 if (entry.element.id == "")
623 entry.element.id = "_toc_" + i;
624 var a = document.createElement("a");
625 a.href = "#" + entry.element.id;
626 a.appendChild(document.createTextNode(entry.text));
627 var div = document.createElement("div");
628 div.appendChild(a);
629 div.className = "toclevel" + entry.toclevel;
630 toc.appendChild(div);
631 }
632 if (entries.length == 0)
633 toc.parentNode.removeChild(toc);
634},
635
636
637/////////////////////////////////////////////////////////////////////
638// Footnotes generator
639/////////////////////////////////////////////////////////////////////
640
641/* Based on footnote generation code from:
642 * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
643 */
644
645footnotes: function () {
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]646 // Delete existing footnote entries in case we're reloading the footnodes.
647 var i;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]648 var noteholder = document.getElementById("footnotes");
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]649 if (!noteholder) {
650 return;
651 }
652 var entriesToRemove = [];
653 for (i = 0; i < noteholder.childNodes.length; i++) {
654 var entry = noteholder.childNodes[i];
655 if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
656 entriesToRemove.push(entry);
657 }
658 for (i = 0; i < entriesToRemove.length; i++) {
659 noteholder.removeChild(entriesToRemove[i]);
660 }
661
662 // Rebuild footnote entries.
663 var cont = document.getElementById("content");
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]664 var spans = cont.getElementsByTagName("span");
665 var refs = {};
666 var n = 0;
667 for (i=0; i<spans.length; i++) {
668 if (spans[i].className == "footnote") {
669 n++;
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]670 var note = spans[i].getAttribute("data-note");
671 if (!note) {
672 // Use [\s\S] in place of . so multi-line matches work.
673 // Because JavaScript has no s (dotall) regex flag.
674 note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
675 spans[i].innerHTML =
676 "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
677 "' title='View footnote' class='footnote'>" + n + "</a>]";
678 spans[i].setAttribute("data-note", note);
679 }
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]680 noteholder.innerHTML +=
681 "<div class='footnote' id='_footnote_" + n + "'>" +
682 "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
683 n + "</a>. " + note + "</div>";
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]684 var id =spans[i].getAttribute("id");
685 if (id != null) refs["#"+id] = n;
686 }
687 }
688 if (n == 0)
689 noteholder.parentNode.removeChild(noteholder);
690 else {
691 // Process footnoterefs.
692 for (i=0; i<spans.length; i++) {
693 if (spans[i].className == "footnoteref") {
694 var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
695 href = href.match(/#.*/)[0]; // Because IE return full URL.
696 n = refs[href];
697 spans[i].innerHTML =
698 "[<a href='#_footnote_" + n +
699 "' title='View footnote' class='footnote'>" + n + "</a>]";
700 }
701 }
702 }
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]703},
704
705install: function(toclevels) {
706 var timerId;
707
708 function reinstall() {
709 asciidoc.footnotes();
710 if (toclevels) {
711 asciidoc.toc(toclevels);
712 }
713 }
714
715 function reinstallAndRemoveTimer() {
716 clearInterval(timerId);
717 reinstall();
718 }
719
720 timerId = setInterval(reinstall, 500);
721 if (document.addEventListener)
722 document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
723 else
724 window.onload = reinstallAndRemoveTimer;
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]725}
726
727}
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]728asciidoc.install();
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]729/*]]>*/
730</script>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]731</head>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]732<body class="manpage">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]733<div id="header">
734<h1>
735git-config(1) Manual Page
736</h1>
737<h2>NAME</h2>
738<div class="sectionbody">
739<p>git-config -
740 Get and set repository or global options
741</p>
742</div>
743</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]744<div id="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]745<div class="sect1">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]746<h2 id="_synopsis">SYNOPSIS</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]747<div class="sectionbody">
748<div class="verseblock">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]749<pre class="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]750<em>git config</em> [&lt;file-option&gt;] [type] --add name value
Junio C Hamano5217a272009-03-21 00:39:33[diff] [blame]751<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]752<em>git config</em> [&lt;file-option&gt;] [type] [-z|--null] --get name [value_regex]
753<em>git config</em> [&lt;file-option&gt;] [type] [-z|--null] --get-all name [value_regex]
754<em>git config</em> [&lt;file-option&gt;] [type] [-z|--null] --get-regexp name_regex [value_regex]
755<em>git config</em> [&lt;file-option&gt;] --unset name [value_regex]
756<em>git config</em> [&lt;file-option&gt;] --unset-all name [value_regex]
757<em>git config</em> [&lt;file-option&gt;] --rename-section old_name new_name
758<em>git config</em> [&lt;file-option&gt;] --remove-section name
759<em>git config</em> [&lt;file-option&gt;] [-z|--null] -l | --list
760<em>git config</em> [&lt;file-option&gt;] --get-color name [default]
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]761<em>git config</em> [&lt;file-option&gt;] --get-colorbool name [stdout-is-tty]
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]762<em>git config</em> [&lt;file-option&gt;] -e | --edit</pre>
763<div class="attribution">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]764</div></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]765</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]766</div>
767<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]768<h2 id="_description">DESCRIPTION</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]769<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]770<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]771actually the section and the key separated by a dot, and the value will be
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]772escaped.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]773<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]774If you want to update or unset an option which can occur on multiple
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]775lines, a POSIX regexp <code>value_regex</code> needs to be given. Only the
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]776existing values that match the regexp are updated or unset. If
777you want to handle the lines that do <strong>not</strong> match the regex, just
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]778prepend 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]779<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]780<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]781convert the value to the canonical form (simple decimal number for int,
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]782a "true" or "false" string for bool), or <em>--path</em>, which does some
783path expansion (see <em>--path</em> below). If no type specifier is passed, no
784checks or transformations are performed on the value.</p></div>
Junio C Hamanobcdb12e2012-05-10 18:45:15[diff] [blame]785<div class="paragraph"><p>When reading, the values are read from the system, global and
786repository local configuration files by default, and options
787<em>--system</em>, <em>--global</em>, <em>--local</em> and <em>--file &lt;filename&gt;</em> can be
788used to tell the command to read from only that location (see <a href="#FILES">[FILES]</a>).</p></div>
789<div class="paragraph"><p>When writing, the new value is written to the repository local
790configuration file by default, and options <em>--system</em>, <em>--global</em>,
791<em>--file &lt;filename&gt;</em> can be used to tell the command to write to
792that location (you can say <em>--local</em> but that is the default).</p></div>
Junio C Hamanof3353932012-09-04 23:16:51[diff] [blame]793<div class="paragraph"><p>This command will fail with non-zero status upon error. Some exit
794codes are:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]795<div class="olist arabic"><ol class="arabic">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]796<li>
797<p>
Junio C Hamano2a294cd2011-05-23 23:06:31[diff] [blame]798The config file is invalid (ret=3),
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]799</p>
800</li>
801<li>
802<p>
Junio C Hamano2a294cd2011-05-23 23:06:31[diff] [blame]803can not write to the config file (ret=4),
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]804</p>
805</li>
806<li>
807<p>
Junio C Hamano2a294cd2011-05-23 23:06:31[diff] [blame]808no section or name was provided (ret=2),
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]809</p>
810</li>
811<li>
812<p>
Junio C Hamano2a294cd2011-05-23 23:06:31[diff] [blame]813the section or key is invalid (ret=1),
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]814</p>
815</li>
816<li>
817<p>
Junio C Hamano2a294cd2011-05-23 23:06:31[diff] [blame]818you try to unset an option which does not exist (ret=5),
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]819</p>
820</li>
821<li>
822<p>
Junio C Hamanof3353932012-09-04 23:16:51[diff] [blame]823you try to unset/set an option for which multiple lines match (ret=5), or
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]824</p>
825</li>
826<li>
827<p>
Junio C Hamanof3353932012-09-04 23:16:51[diff] [blame]828you try to use an invalid regexp (ret=6).
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]829</p>
830</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]831</ol></div>
Junio C Hamano2a294cd2011-05-23 23:06:31[diff] [blame]832<div class="paragraph"><p>On success, the command returns the exit code 0.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]833</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]834</div>
835<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]836<h2 id="_options">OPTIONS</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]837<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]838<div class="dlist"><dl>
839<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]840--replace-all
841</dt>
842<dd>
843<p>
844 Default behavior is to replace at most one line. This replaces
845 all lines matching the key (and optionally the value_regex).
846</p>
847</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]848<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]849--add
850</dt>
851<dd>
852<p>
853 Adds a new line to the option without altering any existing
Junio C Hamano89bdb3b2009-05-10 06:48:14[diff] [blame]854 values. This is the same as providing <em>^$</em> as the value_regex
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]855 in <code>--replace-all</code>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]856</p>
857</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]858<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]859--get
860</dt>
861<dd>
862<p>
863 Get the value for a given key (optionally filtered by a regex
864 matching the value). Returns error code 1 if the key was not
Junio C Hamano68e17742013-07-04 00:44:26[diff] [blame]865 found and the last value if multiple key values were found.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]866</p>
867</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]868<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]869--get-all
870</dt>
871<dd>
872<p>
873 Like get, but does not fail if the number of values for the key
874 is not exactly one.
875</p>
876</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]877<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]878--get-regexp
879</dt>
880<dd>
881<p>
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]882 Like --get-all, but interprets the name as a regular expression and
883 writes out the key names. Regular expression matching is currently
884 case-sensitive and done against a canonicalized version of the key
885 in which section and variable names are lowercased, but subsection
886 names are not.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]887</p>
888</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]889<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]890--global
891</dt>
892<dd>
893<p>
Junio C Hamano8edb4c72012-07-09 20:33:55[diff] [blame]894 For writing options: write to global <sub>/.gitconfig file rather than
895 the repository .git/config, write to $XDG_CONFIG_HOME/git/config file
896 if this file exists and the </sub>/.gitconfig file doesn&#8217;t.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]897</p>
Junio C Hamano8edb4c72012-07-09 20:33:55[diff] [blame]898<div class="paragraph"><p>For reading options: read only from global ~/.gitconfig and from
899$XDG_CONFIG_HOME/git/config rather than from all available files.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]900<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]901</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]902<dt class="hdlist1">
Junio C Hamano81c711d2007-04-20 07:20:14[diff] [blame]903--system
904</dt>
905<dd>
906<p>
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]907 For writing options: write to system-wide $(prefix)/etc/gitconfig
908 rather than the repository .git/config.
Junio C Hamano81c711d2007-04-20 07:20:14[diff] [blame]909</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]910<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]911rather than from all available files.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]912<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div>
Junio C Hamano81c711d2007-04-20 07:20:14[diff] [blame]913</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]914<dt class="hdlist1">
Junio C Hamano8ab94942013-06-24 21:55:30[diff] [blame]915--local
916</dt>
917<dd>
918<p>
919 For writing options: write to the repository .git/config file.
920 This is the default behavior.
921</p>
922<div class="paragraph"><p>For reading options: read only from the repository .git/config rather than
923from all available files.</p></div>
924<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div>
925</dd>
926<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]927-f config-file
928</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]929<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]930--file config-file
Junio C Hamano0ddc94d2007-08-01 08:42:39[diff] [blame]931</dt>
932<dd>
933<p>
934 Use the given config file instead of the one specified by GIT_CONFIG.
935</p>
936</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]937<dt class="hdlist1">
Junio C Hamanod15328a2007-03-09 09:06:40[diff] [blame]938--remove-section
939</dt>
940<dd>
941<p>
942 Remove the given section from the configuration file.
943</p>
944</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]945<dt class="hdlist1">
Junio C Hamanod15328a2007-03-09 09:06:40[diff] [blame]946--rename-section
947</dt>
948<dd>
949<p>
950 Rename the given section to a new name.
951</p>
952</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]953<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]954--unset
955</dt>
956<dd>
957<p>
958 Remove the line matching the key from config file.
959</p>
960</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]961<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]962--unset-all
963</dt>
964<dd>
965<p>
Junio C Hamano10557772007-03-15 07:12:30[diff] [blame]966 Remove all lines matching the key from config file.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]967</p>
968</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]969<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]970-l
971</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]972<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]973--list
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]974</dt>
975<dd>
976<p>
977 List all variables set in config file.
978</p>
979</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]980<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]981--bool
982</dt>
983<dd>
984<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]985 <em>git config</em> will ensure that the output is "true" or "false"
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]986</p>
987</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]988<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]989--int
990</dt>
991<dd>
992<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]993 <em>git config</em> will ensure that the output is a simple
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]994 decimal number. An optional value suffix of <em>k</em>, <em>m</em>, or <em>g</em>
995 in the config file will cause the value to be multiplied
996 by 1024, 1048576, or 1073741824 prior to output.
997</p>
998</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]999<dt class="hdlist1">
Junio C Hamano792c5a92009-03-08 08:45:13[diff] [blame]1000--bool-or-int
1001</dt>
1002<dd>
1003<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1004 <em>git config</em> will ensure that the output matches the format of
Junio C Hamano792c5a92009-03-08 08:45:13[diff] [blame]1005 either --bool or --int, as described above.
1006</p>
1007</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1008<dt class="hdlist1">
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]1009--path
1010</dt>
1011<dd>
1012<p>
1013 <em>git-config</em> will expand leading <em>&#126;</em> to the value of
1014 <em>$HOME</em>, and <em>&#126;user</em> to the home directory for the
1015 specified user. This option has no effect when setting the
1016 value (but you can use <em>git config bla &#126;/</em> from the
1017 command line to let your shell do the expansion).
1018</p>
1019</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1020<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1021-z
1022</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1023<dt class="hdlist1">
Junio C Hamanoeb415992008-06-08 22:49:47[diff] [blame]1024--null
Junio C Hamanoddc5ad42007-06-27 07:14:52[diff] [blame]1025</dt>
1026<dd>
1027<p>
1028 For all options that output values and/or keys, always
Junio C Hamano1f511962008-01-30 08:28:52[diff] [blame]1029 end values with the null character (instead of a
Junio C Hamanoddc5ad42007-06-27 07:14:52[diff] [blame]1030 newline). Use newline instead as a delimiter between
1031 key and value. This allows for secure parsing of the
1032 output without getting confused e.g. by values that
1033 contain line breaks.
1034</p>
1035</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1036<dt class="hdlist1">
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]1037--get-colorbool name [stdout-is-tty]
1038</dt>
1039<dd>
1040<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1041 Find the color setting for <code>name</code> (e.g. <code>color.diff</code>) and output
1042 "true" or "false". <code>stdout-is-tty</code> should be either "true" or
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]1043 "false", and is taken into account when configuration says
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1044 "auto". If <code>stdout-is-tty</code> is missing, then checks the standard
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]1045 output of the command itself, and exits with status 0 if color
1046 is to be used, or exits with status 1 otherwise.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1047 When the color setting for <code>name</code> is undefined, the command uses
1048 <code>color.ui</code> as fallback.
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]1049</p>
1050</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1051<dt class="hdlist1">
Junio C Hamano89bdb3b2009-05-10 06:48:14[diff] [blame]1052--get-color name [default]
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]1053</dt>
1054<dd>
1055<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1056 Find the color configured for <code>name</code> (e.g. <code>color.diff.new</code>) and
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]1057 output it as the ANSI color escape sequence to the standard
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1058 output. The optional <code>default</code> parameter is used instead, if
1059 there is no color configured for <code>name</code>.
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]1060</p>
1061</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1062<dt class="hdlist1">
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]1063-e
1064</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1065<dt class="hdlist1">
Junio C Hamano0a235222009-03-06 08:21:09[diff] [blame]1066--edit
1067</dt>
1068<dd>
1069<p>
1070 Opens an editor to modify the specified config file; either
1071 <em>--system</em>, <em>--global</em>, or repository (default).
1072</p>
1073</dd>
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]1074<dt class="hdlist1">
Junio C Hamano3d1b5a12013-05-17 23:34:02[diff] [blame]1075--[no-]includes
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]1076</dt>
1077<dd>
1078<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1079 Respect <code>include.*</code> directives in config files when looking up
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]1080 values. Defaults to on.
1081</p>
1082</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1083</dl></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1084</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1085</div>
1086<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1087<h2 id="FILES">FILES</h2>
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]1088<div class="sectionbody">
Junio C Hamano8edb4c72012-07-09 20:33:55[diff] [blame]1089<div class="paragraph"><p>If not set explicitly with <em>--file</em>, there are four files where
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1090<em>git config</em> will search for configuration options:</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1091<div class="dlist"><dl>
1092<dt class="hdlist1">
Junio C Hamano8401f142013-07-12 22:47:46[diff] [blame^]1093$(prefix)/etc/gitconfig
Junio C Hamano58155b42007-09-15 07:46:14[diff] [blame]1094</dt>
1095<dd>
1096<p>
Junio C Hamano8401f142013-07-12 22:47:46[diff] [blame^]1097 System-wide configuration file.
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]1098</p>
1099</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1100<dt class="hdlist1">
Junio C Hamano8edb4c72012-07-09 20:33:55[diff] [blame]1101$XDG_CONFIG_HOME/git/config
1102</dt>
1103<dd>
1104<p>
1105 Second user-specific configuration file. If $XDG_CONFIG_HOME is not set
1106 or empty, $HOME/.config/git/config will be used. Any single-valued
1107 variable set in this file will be overwritten by whatever is in
1108 ~/.gitconfig. It is a good idea not to create this file if
1109 you sometimes use older versions of Git, as support for this
1110 file was added fairly recently.
1111</p>
1112</dd>
1113<dt class="hdlist1">
Junio C Hamano8401f142013-07-12 22:47:46[diff] [blame^]1114~/.gitconfig
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]1115</dt>
1116<dd>
1117<p>
Junio C Hamano8401f142013-07-12 22:47:46[diff] [blame^]1118 User-specific configuration file. Also called "global"
1119 configuration file.
1120</p>
1121</dd>
1122<dt class="hdlist1">
1123$GIT_DIR/config
1124</dt>
1125<dd>
1126<p>
1127 Repository specific configuration file.
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]1128</p>
1129</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1130</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1131<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]1132files that are available. If the global or the system-wide configuration
1133file are not available they will be ignored. If the repository configuration
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1134file 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]1135error code. However, in neither case will an error message be issued.</p></div>
Junio C Hamano8401f142013-07-12 22:47:46[diff] [blame^]1136<div class="paragraph"><p>The files are read in the order given above, with last value found taking
1137precedence over values read earlier. When multiple values are taken then all
1138values of a key from all files will be used.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1139<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]1140configuration file. Note that this also affects options like <em>--replace-all</em>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1141and <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]1142<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]1143variables. The <em>--global</em> and the <em>--system</em> options will limit the file used
1144to the global or system-wide file respectively. The GIT_CONFIG environment
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1145variable has a similar effect, but you can specify any filename you want.</p></div>
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]1146</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1147</div>
1148<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1149<h2 id="_environment">ENVIRONMENT</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1150<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1151<div class="dlist"><dl>
1152<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1153GIT_CONFIG
1154</dt>
1155<dd>
1156<p>
1157 Take the configuration from the given file instead of .git/config.
Junio C Hamano6fddfe52007-05-31 07:38:19[diff] [blame]1158 Using the "--global" option forces this to ~/.gitconfig. Using the
1159 "--system" option forces this to $(prefix)/etc/gitconfig.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1160</p>
1161</dd>
Junio C Hamanoeec745b2013-01-07 08:08:20[diff] [blame]1162<dt class="hdlist1">
1163GIT_CONFIG_NOSYSTEM
1164</dt>
1165<dd>
1166<p>
1167 Whether to skip reading settings from the system-wide
1168 $(prefix)/etc/gitconfig file. See <a href="git.html">git(1)</a> for details.
1169</p>
1170</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1171</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1172<div class="paragraph"><p>See also <a href="#FILES">[FILES]</a>.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1173</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1174</div>
1175<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1176<h2 id="EXAMPLES">EXAMPLES</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1177<div class="sectionbody">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1178<div class="paragraph"><p>Given a .git/config like this:</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1179<div class="literalblock">
1180<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1181<pre><code>#
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1182# This is the config file, and
1183# a '#' or ';' character indicates
1184# a comment
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1185#</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1186</div></div>
1187<div class="literalblock">
1188<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1189<pre><code>; core variables
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1190[core]
1191 ; Don't trust file modes
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1192 filemode = false</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1193</div></div>
1194<div class="literalblock">
1195<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1196<pre><code>; Our diff algorithm
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1197[diff]
Junio C Hamano85c71572008-07-28 00:03:31[diff] [blame]1198 external = /usr/local/bin/diff-wrapper
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1199 renames = true</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1200</div></div>
1201<div class="literalblock">
1202<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1203<pre><code>; Proxy settings
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1204[core]
Junio C Hamano53850262012-08-29 23:03:49[diff] [blame]1205 gitproxy=proxy-command for kernel.org
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1206 gitproxy=default-proxy ; for all the rest</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1207</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1208<div class="paragraph"><p>you can set the filemode to true with</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1209<div class="listingblock">
1210<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1211<pre><code>% git config core.filemode true</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1212</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1213<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]1214what URL they apply to. Here is how to change the entry for kernel.org
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1215to "ssh".</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1216<div class="listingblock">
1217<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1218<pre><code>% git config core.gitproxy '"ssh" for kernel.org' 'for kernel.org$'</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1219</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1220<div class="paragraph"><p>This makes sure that only the key/value pair for kernel.org is replaced.</p></div>
1221<div class="paragraph"><p>To delete the entry for renames, do</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1222<div class="listingblock">
1223<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1224<pre><code>% git config --unset diff.renames</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1225</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1226<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]1227you have to provide a regex matching the value of exactly one line.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1228<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]1229<div class="listingblock">
1230<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1231<pre><code>% git config --get core.filemode</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1232</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1233<div class="paragraph"><p>or</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1234<div class="listingblock">
1235<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1236<pre><code>% git config core.filemode</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1237</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1238<div class="paragraph"><p>or, to query a multivar:</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1239<div class="listingblock">
1240<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1241<pre><code>% git config --get core.gitproxy "for kernel.org$"</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1242</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1243<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]1244<div class="listingblock">
1245<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1246<pre><code>% git config --get-all core.gitproxy</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1247</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1248<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]1249new one with</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1250<div class="listingblock">
1251<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1252<pre><code>% git config --replace-all core.gitproxy ssh</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1253</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1254<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]1255i.e. the one without a "for &#8230;" postfix, do something like this:</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1256<div class="listingblock">
1257<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1258<pre><code>% git config core.gitproxy ssh '! for '</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1259</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1260<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]1261<div class="listingblock">
1262<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1263<pre><code>% git config section.key value '[!]'</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1264</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1265<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]1266<div class="listingblock">
1267<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1268<pre><code>% git config --add core.gitproxy '"proxy-command" for example.com'</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1269</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1270<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]1271script:</p></div>
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]1272<div class="listingblock">
1273<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1274<pre><code>#!/bin/sh
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]1275WS=$(git config --get-color color.diff.whitespace "blue reverse")
1276RESET=$(git config --get-color "" "reset")
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1277echo "${WS}your whitespace color or blue reverse${RESET}"</code></pre>
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]1278</div></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1279</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1280</div>
1281<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1282<h2 id="_configuration_file">CONFIGURATION FILE</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1283<div class="sectionbody">
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1284<div class="paragraph"><p>The Git configuration file contains a number of variables that affect
1285the Git commands' behavior. The <code>.git/config</code> file in each repository
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]1286is used to store the configuration for that repository, and
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1287<code>$HOME/.gitconfig</code> is used to store a per-user configuration as
1288fallback values for the <code>.git/config</code> file. The file <code>/etc/gitconfig</code>
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]1289can be used to store a system-wide default configuration.</p></div>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1290<div class="paragraph"><p>The configuration variables are used by both the Git plumbing
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]1291and the porcelains. The variables are divided into sections, wherein
1292the fully qualified variable name of the variable itself is the last
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1293dot-separated segment and the section name is everything before the last
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]1294dot. The variable names are case-insensitive, allow only alphanumeric
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1295characters and <code>-</code>, and must start with an alphabetic character. Some
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]1296variables may appear multiple times.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1297<div class="sect2">
1298<h3 id="_syntax">Syntax</h3>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1299<div class="paragraph"><p>The syntax is fairly flexible and permissive; whitespaces are mostly
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1300ignored. The <em>#</em> and <em>;</em> characters begin comments to the end of line,
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1301blank lines are ignored.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1302<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]1303the name of the section in square brackets and continues until the next
1304section begins. Section names are not case sensitive. Only alphanumeric
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1305characters, <code>-</code> and <code>.</code> are allowed in section names. Each variable
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]1306must belong to some section, which means that there must be a section
1307header before the first setting of a variable.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1308<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]1309put its name in double quotes, separated by space from the section name,
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]1310in the section header, like in the example below:</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1311<div class="listingblock">
1312<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1313<pre><code> [section "subsection"]</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1314</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1315<div class="paragraph"><p>Subsection names are case sensitive and can contain any characters except
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1316newline (doublequote <code>"</code> and backslash have to be escaped as <code>\"</code> and <code>\\</code>,
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]1317respectively). Section headers cannot span multiple
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1318lines. Variables may belong directly to a section or to a given subsection.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1319You can have <code>[section]</code> if you have <code>[section "subsection"]</code>, but you
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1320don&#8217;t need to.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1321<div class="paragraph"><p>There is also a deprecated <code>[section.subsection]</code> syntax. With this
Junio C Hamano6231f822011-10-24 05:18:52[diff] [blame]1322syntax, the subsection name is converted to lower-case and is also
1323compared case sensitively. These subsection names follow the same
1324restrictions as section names.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1325<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]1326header) are recognized as setting variables, in the form
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1327<em>name = value</em>. If there is no equal sign on the line, the entire line
1328is taken as <em>name</em> and the variable is recognized as boolean "true".
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]1329The variable names are case-insensitive, allow only alphanumeric characters
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1330and <code>-</code>, and must start with an alphabetic character. There can be more
Junio C Hamano81d540a2012-03-02 19:52:47[diff] [blame]1331than one value for a given variable; we say then that the variable is
1332multivalued.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1333<div class="paragraph"><p>Leading and trailing whitespace in a variable value is discarded.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1334Internal whitespace within a variable value is retained verbatim.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1335<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]1336a string, an integer, or a boolean. Boolean values may be given as yes/no,
Junio C Hamano059bca52011-03-30 22:47:46[diff] [blame]13371/0, true/false or on/off. Case is not significant in boolean values, when
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1338converting value to the canonical form using <em>--bool</em> type specifier;
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]1339<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]1340<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]1341You need to enclose variable values in double quotes if you want to
1342preserve leading or trailing whitespace, or if the variable value contains
1343comment characters (i.e. it contains <em>#</em> or <em>;</em>).
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1344Double quote <code>"</code> and backslash <code>\</code> characters in variable values must
1345be escaped: use <code>\"</code> for <code>"</code> and <code>\\</code> for <code>\</code>.</p></div>
1346<div class="paragraph"><p>The following escape sequences (beside <code>\"</code> and <code>\\</code>) are recognized:
1347<code>\n</code> for newline character (NL), <code>\t</code> for horizontal tabulation (HT, TAB)
1348and <code>\b</code> for backspace (BS). No other char escape sequence, nor octal
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1349char sequences are valid.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1350<div class="paragraph"><p>Variable values ending in a <code>\</code> are continued on the next line in the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1351customary UNIX fashion.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1352<div class="paragraph"><p>Some variables may require a special value format.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1353</div>
1354<div class="sect2">
1355<h3 id="_includes">Includes</h3>
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]1356<div class="paragraph"><p>You can include one config file from another by setting the special
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1357<code>include.path</code> variable to the name of the file to be included. The
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]1358included file is expanded immediately, as if its contents had been
1359found at the location of the include directive. If the value of the
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1360<code>include.path</code> variable is a relative path, the path is considered to be
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]1361relative to the configuration file in which the include directive was
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1362found. The value of <code>include.path</code> is subject to tilde expansion: <code>~/</code>
1363is expanded to the value of <code>$HOME</code>, and <code>~user/</code> to the specified
Junio C Hamano4d61c4a2012-04-30 01:10:22[diff] [blame]1364user&#8217;s home directory. See below for examples.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1365</div>
1366<div class="sect2">
1367<h3 id="_example">Example</h3>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1368<div class="literalblock">
1369<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1370<pre><code># Core variables
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1371[core]
1372 ; Don't trust file modes
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1373 filemode = false</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1374</div></div>
1375<div class="literalblock">
1376<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1377<pre><code># Our diff algorithm
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1378[diff]
Junio C Hamano85c71572008-07-28 00:03:31[diff] [blame]1379 external = /usr/local/bin/diff-wrapper
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1380 renames = true</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1381</div></div>
1382<div class="literalblock">
1383<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1384<pre><code>[branch "devel"]
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1385 remote = origin
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1386 merge = refs/heads/devel</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1387</div></div>
1388<div class="literalblock">
1389<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1390<pre><code># Proxy settings
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1391[core]
Junio C Hamanoc71a8732007-08-04 00:27:26[diff] [blame]1392 gitProxy="ssh" for "kernel.org"
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1393 gitProxy=default-proxy ; for the rest</code></pre>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1394</div></div>
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]1395<div class="literalblock">
1396<div class="content">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1397<pre><code>[include]
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]1398 path = /path/to/foo.inc ; include by absolute path
Junio C Hamano4d61c4a2012-04-30 01:10:22[diff] [blame]1399 path = foo ; expand "foo" relative to the current file
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1400 path = ~/foo ; expand "foo" in your $HOME directory</code></pre>
Junio C Hamanoe0238c22012-02-23 22:45:50[diff] [blame]1401</div></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1402</div>
1403<div class="sect2">
1404<h3 id="_variables">Variables</h3>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1405<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]1406For command-specific variables, you will find a more detailed description
1407in the appropriate manual page. You will find a description of non-core
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1408porcelain configuration variables in the respective porcelain documentation.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1409<div class="dlist"><dl>
1410<dt class="hdlist1">
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1411advice.*
1412</dt>
1413<dd>
1414<p>
Junio C Hamano0df92712011-12-21 22:30:44[diff] [blame]1415 These variables control various optional help messages designed to
1416 aid new users. All <em>advice.*</em> variables default to <em>true</em>, and you
1417 can tell Git that you do not need help by setting these to <em>false</em>:
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1418</p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1419<div class="openblock">
1420<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1421<div class="dlist"><dl>
1422<dt class="hdlist1">
Junio C Hamanoabad6da2013-01-06 09:06:32[diff] [blame]1423pushUpdateRejected
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1424</dt>
1425<dd>
1426<p>
Junio C Hamano0c1b64e2012-04-20 23:50:49[diff] [blame]1427 Set this variable to <em>false</em> if you want to disable
Junio C Hamanoabad6da2013-01-06 09:06:32[diff] [blame]1428 <em>pushNonFFCurrent</em>, <em>pushNonFFDefault</em>,
Junio C Hamano3f2ed6f2013-02-04 19:24:09[diff] [blame]1429 <em>pushNonFFMatching</em>, <em>pushAlreadyExists</em>,
1430 <em>pushFetchFirst</em>, and <em>pushNeedsForce</em>
Junio C Hamanoabad6da2013-01-06 09:06:32[diff] [blame]1431 simultaneously.
Junio C Hamano0c1b64e2012-04-20 23:50:49[diff] [blame]1432</p>
1433</dd>
1434<dt class="hdlist1">
1435pushNonFFCurrent
1436</dt>
1437<dd>
1438<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1439 Advice shown when <a href="git-push.html">git-push(1)</a> fails due to a
Junio C Hamano0c1b64e2012-04-20 23:50:49[diff] [blame]1440 non-fast-forward update to the current branch.
1441</p>
1442</dd>
1443<dt class="hdlist1">
1444pushNonFFDefault
1445</dt>
1446<dd>
1447<p>
1448 Advice to set <em>push.default</em> to <em>upstream</em> or <em>current</em>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1449 when you ran <a href="git-push.html">git-push(1)</a> and pushed <em>matching
Junio C Hamano0c1b64e2012-04-20 23:50:49[diff] [blame]1450 refs</em> by default (i.e. you did not provide an explicit
1451 refspec, and no <em>push.default</em> configuration was set)
1452 and it resulted in a non-fast-forward error.
1453</p>
1454</dd>
1455<dt class="hdlist1">
1456pushNonFFMatching
1457</dt>
1458<dd>
1459<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1460 Advice shown when you ran <a href="git-push.html">git-push(1)</a> and pushed
Junio C Hamano0c1b64e2012-04-20 23:50:49[diff] [blame]1461 <em>matching refs</em> explicitly (i.e. you used <em>:</em>, or
1462 specified a refspec that isn&#8217;t your current branch) and
1463 it resulted in a non-fast-forward error.
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1464</p>
1465</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1466<dt class="hdlist1">
Junio C Hamanoabad6da2013-01-06 09:06:32[diff] [blame]1467pushAlreadyExists
1468</dt>
1469<dd>
1470<p>
1471 Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
1472 does not qualify for fast-forwarding (e.g., a tag.)
1473</p>
1474</dd>
1475<dt class="hdlist1">
Junio C Hamano3f2ed6f2013-02-04 19:24:09[diff] [blame]1476pushFetchFirst
1477</dt>
1478<dd>
1479<p>
1480 Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
1481 tries to overwrite a remote ref that points at an
1482 object we do not have.
1483</p>
1484</dd>
1485<dt class="hdlist1">
1486pushNeedsForce
1487</dt>
1488<dd>
1489<p>
1490 Shown when <a href="git-push.html">git-push(1)</a> rejects an update that
1491 tries to overwrite a remote ref that points at an
1492 object that is not a committish, or make the remote
1493 ref point at an object that is not a committish.
1494</p>
1495</dd>
1496<dt class="hdlist1">
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1497statusHints
1498</dt>
1499<dd>
1500<p>
Junio C Hamano644936c2012-06-28 23:05:14[diff] [blame]1501 Show directions on how to proceed from the current
Junio C Hamano917cd4f2012-12-04 23:41:10[diff] [blame]1502 state in the output of <a href="git-status.html">git-status(1)</a>, in
Junio C Hamano644936c2012-06-28 23:05:14[diff] [blame]1503 the template shown when writing commit messages in
Junio C Hamano917cd4f2012-12-04 23:41:10[diff] [blame]1504 <a href="git-commit.html">git-commit(1)</a>, and in the help message shown
1505 by <a href="git-checkout.html">git-checkout(1)</a> when switching branch.
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1506</p>
1507</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1508<dt class="hdlist1">
Junio C Hamano5e7f1312013-03-21 22:49:01[diff] [blame]1509statusUoption
1510</dt>
1511<dd>
1512<p>
1513 Advise to consider using the <code>-u</code> option to <a href="git-status.html">git-status(1)</a>
1514 when the command takes more than 2 seconds to enumerate untracked
1515 files.
1516</p>
1517</dd>
1518<dt class="hdlist1">
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]1519commitBeforeMerge
1520</dt>
1521<dd>
1522<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1523 Advice shown when <a href="git-merge.html">git-merge(1)</a> refuses to
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1524 merge to avoid overwriting local changes.
Junio C Hamano5706e0b2009-11-24 10:54:16[diff] [blame]1525</p>
1526</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1527<dt class="hdlist1">
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]1528resolveConflict
1529</dt>
1530<dd>
1531<p>
Junio C Hamano5dab5a92013-02-25 18:51:24[diff] [blame]1532 Advice shown by various commands when conflicts
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]1533 prevent the operation from being performed.
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]1534</p>
1535</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1536<dt class="hdlist1">
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]1537implicitIdentity
1538</dt>
1539<dd>
1540<p>
1541 Advice on how to set your identity configuration when
1542 your information is guessed from the system username and
Junio C Hamano0df92712011-12-21 22:30:44[diff] [blame]1543 domain name.
Junio C Hamanoa9701f02010-01-21 00:42:16[diff] [blame]1544</p>
1545</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1546<dt class="hdlist1">
Junio C Hamano74a198f2010-02-22 00:13:31[diff] [blame]1547detachedHead
1548</dt>
1549<dd>
1550<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1551 Advice shown when you used <a href="git-checkout.html">git-checkout(1)</a> to
Junio C Hamano74a198f2010-02-22 00:13:31[diff] [blame]1552 move to the detach HEAD state, to instruct how to create
Junio C Hamano0df92712011-12-21 22:30:44[diff] [blame]1553 a local branch after the fact.
Junio C Hamano74a198f2010-02-22 00:13:31[diff] [blame]1554</p>
1555</dd>
Junio C Hamanobb300642012-07-22 21:09:14[diff] [blame]1556<dt class="hdlist1">
1557amWorkDir
1558</dt>
1559<dd>
1560<p>
1561 Advice that shows the location of the patch file when
1562 <a href="git-am.html">git-am(1)</a> fails to apply it.
1563</p>
1564</dd>
Junio C Hamano8ab94942013-06-24 21:55:30[diff] [blame]1565<dt class="hdlist1">
1566rmHints
1567</dt>
1568<dd>
1569<p>
1570 In case of failure in the output of <a href="git-rm.html">git-rm(1)</a>,
1571 show directions on how to proceed from the current state.
1572</p>
1573</dd>
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1574</dl></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1575</div></div>
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]1576</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1577<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1578core.fileMode
1579</dt>
1580<dd>
1581<p>
1582 If false, the executable bit differences between the index and
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]1583 the working tree are ignored; useful on broken filesystems like FAT.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1584 See <a href="git-update-index.html">git-update-index(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1585</p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1586<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]1587will probe and set core.fileMode false if appropriate when the
1588repository is created.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1589</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1590<dt class="hdlist1">
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1591core.ignoreCygwinFSTricks
1592</dt>
1593<dd>
1594<p>
1595 This option is only used by Cygwin implementation of Git. If false,
1596 the Cygwin stat() and lstat() functions are used. This may be useful
1597 if your repository consists of a few separate directories joined in
1598 one hierarchy using Cygwin mount. If true, Git uses native Win32 API
1599 whenever it is possible and falls back to Cygwin functions only to
1600 handle symbol links. The native mode is more than twice faster than
Junio C Hamano7d06a8a2008-10-20 05:42:33[diff] [blame]1601 normal Cygwin l/stat() functions. True by default, unless core.filemode
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1602 is true, in which case ignoreCygwinFSTricks is ignored as Cygwin&#8217;s
Junio C Hamano7d06a8a2008-10-20 05:42:33[diff] [blame]1603 POSIX emulation is required to support core.filemode.
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]1604</p>
1605</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1606<dt class="hdlist1">
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1607core.ignorecase
1608</dt>
1609<dd>
1610<p>
1611 If true, this option enables various workarounds to enable
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1612 Git to work better on filesystems that are not case sensitive,
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1613 like FAT. For example, if a directory listing finds
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1614 "makefile" when Git expects "Makefile", Git will assume
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1615 it is really the same file, and continue to remember it as
1616 "Makefile".
1617</p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1618<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]1619will probe and set core.ignorecase true if appropriate when the repository
1620is created.</p></div>
1621</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1622<dt class="hdlist1">
Junio C Hamanob61a7772012-07-13 23:34:48[diff] [blame]1623core.precomposeunicode
1624</dt>
1625<dd>
1626<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1627 This option is only used by Mac OS implementation of Git.
1628 When core.precomposeunicode=true, Git reverts the unicode decomposition
Junio C Hamanob61a7772012-07-13 23:34:48[diff] [blame]1629 of filenames done by Mac OS. This is useful when sharing a repository
1630 between Mac OS and Linux or Windows.
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1631 (Git for Windows 1.7.10 or higher is needed, or Git under cygwin 1.7).
1632 When false, file names are handled fully transparent by Git,
1633 which is backward compatible with older versions of Git.
Junio C Hamanob61a7772012-07-13 23:34:48[diff] [blame]1634</p>
1635</dd>
1636<dt class="hdlist1">
Junio C Hamano90ccff32008-07-29 08:17:24[diff] [blame]1637core.trustctime
1638</dt>
1639<dd>
1640<p>
1641 If false, the ctime differences between the index and the
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]1642 working tree are ignored; useful when the inode change time
Junio C Hamano90ccff32008-07-29 08:17:24[diff] [blame]1643 is regularly modified by something outside Git (file system
1644 crawlers and some backup systems).
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1645 See <a href="git-update-index.html">git-update-index(1)</a>. True by default.
Junio C Hamano90ccff32008-07-29 08:17:24[diff] [blame]1646</p>
1647</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1648<dt class="hdlist1">
Junio C Hamano4cfed0c2013-01-30 17:58:54[diff] [blame]1649core.checkstat
1650</dt>
1651<dd>
1652<p>
1653 Determines which stat fields to match between the index
1654 and work tree. The user can set this to <em>default</em> or
1655 <em>minimal</em>. Default (or explicitly <em>default</em>), is to check
1656 all fields, including the sub-second part of mtime and ctime.
1657</p>
1658</dd>
1659<dt class="hdlist1">
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1660core.quotepath
1661</dt>
1662<dd>
1663<p>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1664 The commands that output paths (e.g. <em>ls-files</em>,
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1665 <em>diff</em>), when not given the <code>-z</code> option, will quote
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1666 "unusual" characters in the pathname by enclosing the
1667 pathname in a double-quote pair and with backslashes the
1668 same way strings in C source code are quoted. If this
1669 variable is set to false, the bytes higher than 0x80 are
1670 not quoted but output as verbatim. Note that double
1671 quote, backslash and control characters are always
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1672 quoted without <code>-z</code> regardless of the setting of this
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1673 variable.
1674</p>
1675</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1676<dt class="hdlist1">
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1677core.eol
Junio C Hamanod9e0e5d2007-04-14 16:22:04[diff] [blame]1678</dt>
1679<dd>
1680<p>
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1681 Sets the line ending type to use in the working directory for
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1682 files that have the <code>text</code> property set. Alternatives are
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1683 <em>lf</em>, <em>crlf</em> and <em>native</em>, which uses the platform&#8217;s native
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1684 line ending. The default value is <code>native</code>. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1685 <a href="gitattributes.html">gitattributes(5)</a> for more information on end-of-line
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1686 conversion.
Junio C Hamanod9e0e5d2007-04-14 16:22:04[diff] [blame]1687</p>
1688</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1689<dt class="hdlist1">
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1690core.safecrlf
1691</dt>
1692<dd>
1693<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1694 If true, makes Git check if converting <code>CRLF</code> is reversible when
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1695 end-of-line conversion is active. Git will verify if a command
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1696 modifies a file in the work tree either directly or indirectly.
1697 For example, committing a file followed by checking out the
1698 same file should yield the original file in the work tree. If
1699 this is not the case for the current setting of
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1700 <code>core.autocrlf</code>, Git will reject the file. The variable can
1701 be set to "warn", in which case Git will only warn about an
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1702 irreversible conversion but continue the operation.
1703</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1704<div class="paragraph"><p>CRLF conversion bears a slight chance of corrupting data.
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1705When it is enabled, Git will convert CRLF to LF during commit and LF to
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1706CRLF during checkout. A file that contains a mixture of LF and
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1707CRLF before the commit cannot be recreated by Git. For text
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1708files this is the right thing to do: it corrects line endings
1709such that we have only LF line endings in the repository.
1710But for binary files that are accidentally classified as text the
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1711conversion can corrupt data.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1712<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]1713setting the conversion type explicitly in .gitattributes. Right
1714after committing you still have the original file in your work
1715tree and this file is not yet corrupted. You can explicitly tell
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1716Git that this file is binary and Git will handle the file
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1717appropriately.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1718<div class="paragraph"><p>Unfortunately, the desired effect of cleaning up text files with
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1719mixed line endings and the undesired effect of corrupting binary
1720files cannot be distinguished. In both cases CRLFs are removed
1721in an irreversible way. For text files this is the right thing
1722to do because CRLFs are line endings, while for binary files
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1723converting CRLFs corrupts data.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1724<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]1725file identical to the original file for a different setting of
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1726<code>core.eol</code> and <code>core.autocrlf</code>, but only for the current one. For
1727example, a text file with <code>LF</code> would be accepted with <code>core.eol=lf</code>
1728and could later be checked out with <code>core.eol=crlf</code>, in which case the
1729resulting file would contain <code>CRLF</code>, although the original file
1730contained <code>LF</code>. However, in both work trees the line endings would be
1731consistent, that is either all <code>LF</code> or all <code>CRLF</code>, but never mixed. A
1732file with mixed line endings would be reported by the <code>core.safecrlf</code>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1733mechanism.</p></div>
Junio C Hamano26e590a2008-02-17 03:53:51[diff] [blame]1734</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1735<dt class="hdlist1">
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1736core.autocrlf
1737</dt>
1738<dd>
1739<p>
1740 Setting this variable to "true" is almost the same as setting
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1741 the <code>text</code> attribute to "auto" on all files except that text
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1742 files are not guaranteed to be normalized: files that contain
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1743 <code>CRLF</code> in the repository will not be touched. Use this
1744 setting if you want to have <code>CRLF</code> line endings in your
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]1745 working directory even though the repository does not have
1746 normalized line endings. This variable can be set to <em>input</em>,
1747 in which case no output conversion is performed.
1748</p>
1749</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1750<dt class="hdlist1">
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]1751core.symlinks
1752</dt>
1753<dd>
1754<p>
1755 If false, symbolic links are checked out as small plain files that
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1756 contain the link text. <a href="git-update-index.html">git-update-index(1)</a> and
1757 <a href="git-add.html">git-add(1)</a> will not change the recorded type to regular
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]1758 file. Useful on filesystems like FAT that do not support
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]1759 symbolic links.
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]1760</p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1761<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]1762will probe and set core.symlinks false if appropriate when the repository
1763is created.</p></div>
Junio C Hamanoaa83a7d2007-03-05 02:37:29[diff] [blame]1764</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1765<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1766core.gitProxy
1767</dt>
1768<dd>
1769<p>
1770 A "proxy command" to execute (as <em>command host port</em>) instead
1771 of establishing direct connection to the remote server when
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1772 using the Git protocol for fetching. If the variable value is
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1773 in the "COMMAND for DOMAIN" format, the command is applied only
1774 on hostnames ending with the specified domain string. This variable
1775 may be set multiple times and is matched in the given order;
1776 the first match wins.
1777</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1778<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]1779(which always applies universally, without the special "for"
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1780handling).</p></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]1781<div class="paragraph"><p>The special string <code>none</code> can be used as the proxy command to
Junio C Hamanoea82cff2009-03-18 01:54:48[diff] [blame]1782specify that no proxy be used for a given domain pattern.
1783This is useful for excluding servers inside a firewall from
1784proxy use, while defaulting to a common proxy for external domains.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1785</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1786<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1787core.ignoreStat
1788</dt>
1789<dd>
1790<p>
Junio C Hamano054ea082008-06-01 08:26:34[diff] [blame]1791 If true, commands which modify both the working tree and the index
1792 will mark the updated paths with the "assume unchanged" bit in the
1793 index. These marked files are then assumed to stay unchanged in the
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]1794 working tree, until you mark them otherwise manually - Git will not
Junio C Hamano054ea082008-06-01 08:26:34[diff] [blame]1795 detect the file changes by lstat() calls. This is useful on systems
1796 where those are very slow, such as Microsoft Windows.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1797 See <a href="git-update-index.html">git-update-index(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1798 False by default.
1799</p>
1800</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1801<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1802core.preferSymlinkRefs
1803</dt>
1804<dd>
1805<p>
1806 Instead of the default "symref" format for HEAD
1807 and other symbolic reference files, use symbolic links.
1808 This is sometimes needed to work with old scripts that
1809 expect HEAD to be a symbolic link.
1810</p>
1811</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1812<dt class="hdlist1">
Junio C Hamano1025e752007-02-23 07:21:26[diff] [blame]1813core.bare
1814</dt>
1815<dd>
1816<p>
1817 If true this repository is assumed to be <em>bare</em> and has no
1818 working directory associated with it. If this is the case a
1819 number of commands that require a working directory will be
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1820 disabled, such as <a href="git-add.html">git-add(1)</a> or <a href="git-merge.html">git-merge(1)</a>.
Junio C Hamano1025e752007-02-23 07:21:26[diff] [blame]1821</p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1822<div class="paragraph"><p>This setting is automatically guessed by <a href="git-clone.html">git-clone(1)</a> or
1823<a href="git-init.html">git-init(1)</a> when the repository was created. By default a
Junio C Hamano1025e752007-02-23 07:21:26[diff] [blame]1824repository that ends in "/.git" is assumed to be not bare (bare =
1825false), while all other repositories are assumed to be bare (bare
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1826= true).</p></div>
Junio C Hamano1025e752007-02-23 07:21:26[diff] [blame]1827</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1828<dt class="hdlist1">
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1829core.worktree
1830</dt>
1831<dd>
1832<p>
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1833 Set the path to the root of the working tree.
Junio C Hamano764a6672007-10-23 01:23:31[diff] [blame]1834 This can be overridden by the GIT_WORK_TREE environment
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1835 variable and the <em>--work-tree</em> command line option.
Junio C Hamano5cd15182011-04-05 00:21:10[diff] [blame]1836 The value can be an absolute path or relative to the path to
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1837 the .git directory, which is either specified by --git-dir
1838 or GIT_DIR, or automatically discovered.
1839 If --git-dir or GIT_DIR is specified but none of
Junio C Hamano7d575a52008-04-30 08:45:27[diff] [blame]1840 --work-tree, GIT_WORK_TREE and core.worktree is specified,
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1841 the current working directory is regarded as the top level
Junio C Hamano3609b332010-12-29 01:34:52[diff] [blame]1842 of your working tree.
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1843</p>
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1844<div class="paragraph"><p>Note that this variable is honored even when set in a configuration
1845file in a ".git" subdirectory of a directory and its value differs
1846from the latter directory (e.g. "/path/to/.git/config" has
1847core.worktree set to "/different/path"), which is most likely a
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1848misconfiguration. Running Git commands in the "/path/to" directory will
Junio C Hamano80d58462011-01-24 22:52:52[diff] [blame]1849still use "/different/path" as the root of the work tree and can cause
1850confusion unless you know what you are doing (e.g. you are creating a
1851read-only snapshot of the same index to a location different from the
1852repository&#8217;s usual working tree).</p></div>
Junio C Hamanod526ba92007-07-02 00:17:42[diff] [blame]1853</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1854<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1855core.logAllRefUpdates
1856</dt>
1857<dd>
1858<p>
Junio C Hamanocae86272007-08-21 02:20:49[diff] [blame]1859 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]1860 "$GIT_DIR/logs/&lt;ref&gt;", by appending the new and old
Junio C Hamanoe3f080d2013-04-22 02:27:13[diff] [blame]1861 SHA-1, the date/time and the reason of the update, but
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1862 only when the file exists. If this configuration
1863 variable is set to true, missing "$GIT_DIR/logs/&lt;ref&gt;"
Junio C Hamano15567bc2011-07-23 00:51:59[diff] [blame]1864 file is automatically created for branch heads (i.e. under
1865 refs/heads/), remote refs (i.e. under refs/remotes/),
1866 note refs (i.e. under refs/notes/), and the symbolic ref HEAD.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1867</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1868<div class="paragraph"><p>This information can be used to determine what commit
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1869was the tip of a branch "2 days ago".</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1870<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]1871a working directory associated with it, and false by
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1872default in a bare repository.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1873</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1874<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1875core.repositoryFormatVersion
1876</dt>
1877<dd>
1878<p>
1879 Internal variable identifying the repository format and layout
1880 version.
1881</p>
1882</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1883<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1884core.sharedRepository
1885</dt>
1886<dd>
1887<p>
1888 When <em>group</em> (or <em>true</em>), the repository is made shareable between
1889 several users in a group (making sure all the files and objects are
1890 group-writable). When <em>all</em> (or <em>world</em> or <em>everybody</em>), the
1891 repository will be readable by all users, additionally to being
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1892 group-shareable. When <em>umask</em> (or <em>false</em>), Git will use permissions
Junio C Hamano2f102bb2008-04-26 02:23:37[diff] [blame]1893 reported by umask(2). When <em>0xxx</em>, where <em>0xxx</em> is an octal number,
1894 files in the repository will have this mode value. <em>0xxx</em> will override
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1895 user&#8217;s umask value (whereas the other options will only override
1896 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]1897 the repo read/write-able for the owner and group, but inaccessible to
1898 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]1899 repository that is group-readable but not group-writable.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]1900 See <a href="git-init.html">git-init(1)</a>. False by default.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1901</p>
1902</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1903<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1904core.warnAmbiguousRefs
1905</dt>
1906<dd>
1907<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]1908 If true, Git will warn you if the ref name you passed it is ambiguous
Junio C Hamano947ab822013-03-19 23:07:29[diff] [blame]1909 and might match multiple refs in the repository. True by default.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1910</p>
1911</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1912<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1913core.compression
1914</dt>
1915<dd>
1916<p>
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]1917 An integer -1..9, indicating a default compression level.
1918 -1 is the zlib default. 0 means no compression,
1919 and 1..9 are various speed/size tradeoffs, 9 being slowest.
Junio C Hamano2e72a942007-11-21 08:54:42[diff] [blame]1920 If set, this provides a default to other compression variables,
1921 such as <em>core.loosecompression</em> and <em>pack.compression</em>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1922</p>
1923</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1924<dt class="hdlist1">
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]1925core.loosecompression
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1926</dt>
1927<dd>
1928<p>
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]1929 An integer -1..9, indicating the compression level for objects that
1930 are not in a pack file. -1 is the zlib default. 0 means no
1931 compression, and 1..9 are various speed/size tradeoffs, 9 being
1932 slowest. If not set, defaults to core.compression. If that is
Junio C Hamano2e72a942007-11-21 08:54:42[diff] [blame]1933 not set, defaults to 1 (best speed).
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1934</p>
1935</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1936<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1937core.packedGitWindowSize
1938</dt>
1939<dd>
1940<p>
1941 Number of bytes of a pack file to map into memory in a
1942 single mapping operation. Larger window sizes may allow
1943 your system to process a smaller number of large pack files
1944 more quickly. Smaller window sizes will negatively affect
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1945 performance due to increased calls to the operating system&#8217;s
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1946 memory manager, but may improve performance when accessing
1947 a large number of large pack files.
1948</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1949<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]1950MiB on 32 bit platforms and 1 GiB on 64 bit platforms. This should
1951be reasonable for all users/operating systems. You probably do
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1952not need to adjust this value.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1953<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]1954</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1955<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]1956core.packedGitLimit
1957</dt>
1958<dd>
1959<p>
1960 Maximum number of bytes to map simultaneously into memory
1961 from pack files. If Git needs to access more than this many
1962 bytes at once to complete an operation it will unmap existing
1963 regions to reclaim virtual address space within the process.
1964</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1965<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]1966This should be reasonable for all users/operating systems, except on
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1967the largest projects. You probably do not need to adjust this value.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1968<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]1969</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1970<dt class="hdlist1">
Junio C Hamanob8c51282007-03-19 10:43:30[diff] [blame]1971core.deltaBaseCacheLimit
1972</dt>
1973<dd>
1974<p>
1975 Maximum number of bytes to reserve for caching base objects
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]1976 that may be referenced by multiple deltified objects. By storing the
Junio C Hamanob8c51282007-03-19 10:43:30[diff] [blame]1977 entire decompressed base objects in a cache Git is able
1978 to avoid unpacking and decompressing frequently used base
1979 objects multiple times.
1980</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1981<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]1982for all users/operating systems, except on the largest projects.
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]1983You probably do not need to adjust this value.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1984<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]1985</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1986<dt class="hdlist1">
Junio C Hamano5c246f22010-02-03 07:34:53[diff] [blame]1987core.bigFileThreshold
1988</dt>
1989<dd>
1990<p>
1991 Files larger than this size are stored deflated, without
1992 attempting delta compression. Storing large files without
1993 delta compression avoids excessive memory usage, at the
1994 slight expense of increased disk usage.
1995</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1996<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]1997for most projects as source code and other text files can still
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]1998be delta compressed, but larger binary media files won&#8217;t be.</p></div>
1999<div class="paragraph"><p>Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are supported.</p></div>
Junio C Hamano5c246f22010-02-03 07:34:53[diff] [blame]2000</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2001<dt class="hdlist1">
Junio C Hamano1d90cb02007-07-03 07:05:31[diff] [blame]2002core.excludesfile
Junio C Hamano5e284b42007-05-22 07:23:37[diff] [blame]2003</dt>
2004<dd>
2005<p>
2006 In addition to <em>.gitignore</em> (per-directory) and
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2007 <em>.git/info/exclude</em>, Git looks into this file for patterns
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2008 of files which are not meant to be tracked. "<code>~/</code>" is expanded
2009 to the value of <code>$HOME</code> and "<code>~user/</code>" to the specified user&#8217;s
Junio C Hamano8edb4c72012-07-09 20:33:55[diff] [blame]2010 home directory. Its default value is $XDG_CONFIG_HOME/git/ignore.
2011 If $XDG_CONFIG_HOME is either not set or empty, $HOME/.config/git/ignore
2012 is used instead. See <a href="gitignore.html">gitignore(5)</a>.
Junio C Hamano5e284b42007-05-22 07:23:37[diff] [blame]2013</p>
2014</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2015<dt class="hdlist1">
Junio C Hamano3fd7b262010-09-08 22:44:20[diff] [blame]2016core.askpass
2017</dt>
2018<dd>
2019<p>
2020 Some commands (e.g. svn and http interfaces) that interactively
2021 ask for a password can be told to use an external program given
2022 via the value of this variable. Can be overridden by the <em>GIT_ASKPASS</em>
2023 environment variable. If not set, fall back to the value of the
2024 <em>SSH_ASKPASS</em> environment variable or, failing that, a simple password
2025 prompt. The external program shall be given a suitable prompt as
2026 command line argument and write the password on its STDOUT.
2027</p>
2028</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2029<dt class="hdlist1">
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]2030core.attributesfile
2031</dt>
2032<dd>
2033<p>
2034 In addition to <em>.gitattributes</em> (per-directory) and
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2035 <em>.git/info/attributes</em>, Git looks into this file for attributes
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2036 (see <a href="gitattributes.html">gitattributes(5)</a>). Path expansions are made the same
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2037 way as for <code>core.excludesfile</code>. Its default value is
Junio C Hamano8edb4c72012-07-09 20:33:55[diff] [blame]2038 $XDG_CONFIG_HOME/git/attributes. If $XDG_CONFIG_HOME is either not
2039 set or empty, $HOME/.config/git/attributes is used instead.
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]2040</p>
2041</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2042<dt class="hdlist1">
Junio C Hamanof6002a92007-07-20 10:28:22[diff] [blame]2043core.editor
2044</dt>
2045<dd>
2046<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2047 Commands such as <code>commit</code> and <code>tag</code> that lets you edit
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]2048 messages by launching an editor uses the value of this
Junio C Hamanof6002a92007-07-20 10:28:22[diff] [blame]2049 variable when it is set, and the environment variable
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2050 <code>GIT_EDITOR</code> is not set. See <a href="git-var.html">git-var(1)</a>.
Junio C Hamanof6002a92007-07-20 10:28:22[diff] [blame]2051</p>
2052</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2053<dt class="hdlist1">
Junio C Hamano3f2ed6f2013-02-04 19:24:09[diff] [blame]2054core.commentchar
2055</dt>
2056<dd>
2057<p>
2058 Commands such as <code>commit</code> and <code>tag</code> that lets you edit
2059 messages consider a line that begins with this character
2060 commented, and removes them after the editor returns
2061 (default <em>#</em>).
2062</p>
2063</dd>
2064<dt class="hdlist1">
Junio C Hamano6231f822011-10-24 05:18:52[diff] [blame]2065sequence.editor
2066</dt>
2067<dd>
2068<p>
Junio C Hamano778a3412013-03-28 23:24:30[diff] [blame]2069 Text editor used by <code>git rebase -i</code> for editing the rebase instruction file.
Junio C Hamano6231f822011-10-24 05:18:52[diff] [blame]2070 The value is meant to be interpreted by the shell when it is used.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2071 It can be overridden by the <code>GIT_SEQUENCE_EDITOR</code> environment variable.
Junio C Hamano6231f822011-10-24 05:18:52[diff] [blame]2072 When not configured the default commit message editor is used instead.
2073</p>
2074</dd>
2075<dt class="hdlist1">
Junio C Hamano28d8ede2007-07-05 05:51:38[diff] [blame]2076core.pager
2077</dt>
2078<dd>
2079<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2080 The command that Git will use to paginate output. Can
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2081 be overridden with the <code>GIT_PAGER</code> environment
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2082 variable. Note that Git sets the <code>LESS</code> environment
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2083 variable to <code>FRSX</code> if it is unset when it runs the
Junio C Hamano0551f6a2008-08-25 00:33:33[diff] [blame]2084 pager. One can change these settings by setting the
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2085 <code>LESS</code> variable to some other value. Alternately,
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]2086 these settings can be overridden on a project or
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2087 global basis by setting the <code>core.pager</code> option.
2088 Setting <code>core.pager</code> has no effect on the <code>LESS</code>
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]2089 environment variable behaviour above, so if you want
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2090 to override Git&#8217;s default settings this way, you need
Junio C Hamanoa476efa2008-10-10 15:31:42[diff] [blame]2091 to be explicit. For example, to disable the S option
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2092 in a backward compatible manner, set <code>core.pager</code>
2093 to <code>less -+S</code>. This will be passed to the shell by
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2094 Git, which will translate the final command to
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2095 <code>LESS=FRSX less -+S</code>.
Junio C Hamano28d8ede2007-07-05 05:51:38[diff] [blame]2096</p>
2097</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2098<dt class="hdlist1">
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]2099core.whitespace
2100</dt>
2101<dd>
2102<p>
2103 A comma separated list of common whitespace problems to
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2104 notice. <em>git diff</em> will use <code>color.diff.whitespace</code> to
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2105 highlight them, and <em>git apply --whitespace=error</em> will
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2106 consider them as errors. You can prefix <code>-</code> to disable
2107 any of them (e.g. <code>-trailing-space</code>):
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]2108</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2109<div class="ulist"><ul>
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]2110<li>
2111<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2112<code>blank-at-eol</code> treats trailing whitespaces at the end of the line
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]2113 as an error (enabled by default).
2114</p>
2115</li>
2116<li>
2117<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2118<code>space-before-tab</code> treats a space character that appears immediately
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]2119 before a tab character in the initial indent part of the line as an
2120 error (enabled by default).
2121</p>
2122</li>
2123<li>
2124<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2125<code>indent-with-non-tab</code> treats a line that is indented with space
Junio C Hamano281fd392012-09-17 23:57:41[diff] [blame]2126 characters instead of the equivalent tabs as an error (not enabled by
2127 default).
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]2128</p>
2129</li>
Junio C Hamano601f3e52008-02-25 08:40:42[diff] [blame]2130<li>
2131<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2132<code>tab-in-indent</code> treats a tab character in the initial indent part of
Junio C Hamanocb39aea2010-05-09 07:24:48[diff] [blame]2133 the line as an error (not enabled by default).
2134</p>
2135</li>
2136<li>
2137<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2138<code>blank-at-eof</code> treats blank lines added at the end of file as an error
Junio C Hamanob71a22d2009-10-17 08:23:47[diff] [blame]2139 (enabled by default).
2140</p>
2141</li>
2142<li>
2143<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2144<code>trailing-space</code> is a short-hand to cover both <code>blank-at-eol</code> and
2145 <code>blank-at-eof</code>.
Junio C Hamanob71a22d2009-10-17 08:23:47[diff] [blame]2146</p>
2147</li>
2148<li>
2149<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2150<code>cr-at-eol</code> treats a carriage-return at the end of line as
2151 part of the line terminator, i.e. with it, <code>trailing-space</code>
Junio C Hamano601f3e52008-02-25 08:40:42[diff] [blame]2152 does not trigger if the character before such a carriage-return
2153 is not a whitespace (not enabled by default).
2154</p>
2155</li>
Junio C Hamanoeef01fe2010-12-13 08:31:58[diff] [blame]2156<li>
2157<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2158<code>tabwidth=&lt;n&gt;</code> tells how many character positions a tab occupies; this
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2159 is relevant for <code>indent-with-non-tab</code> and when Git fixes <code>tab-in-indent</code>
Junio C Hamanoeef01fe2010-12-13 08:31:58[diff] [blame]2160 errors. The default tab width is 8. Allowed values are 1 to 63.
2161</p>
2162</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2163</ul></div>
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]2164</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2165<dt class="hdlist1">
Junio C Hamano9eb57532008-06-26 06:33:46[diff] [blame]2166core.fsyncobjectfiles
2167</dt>
2168<dd>
2169<p>
2170 This boolean will enable <em>fsync()</em> when writing object files.
2171</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2172<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]2173data writes properly, but can be useful for filesystems that do not use
2174journalling (traditional UNIX filesystems) or that only journal metadata
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2175and 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]2176</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2177<dt class="hdlist1">
Junio C Hamano610d1762008-11-28 06:27:13[diff] [blame]2178core.preloadindex
2179</dt>
2180<dd>
2181<p>
2182 Enable parallel index preload for operations like <em>git diff</em>
2183</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2184<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]2185on filesystems like NFS that have weak caching semantics and thus
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2186relatively high IO latencies. With this set to <em>true</em>, Git will do the
Junio C Hamano610d1762008-11-28 06:27:13[diff] [blame]2187index comparison to the filesystem data in parallel, allowing
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2188overlapping IO&#8217;s.</p></div>
Junio C Hamano610d1762008-11-28 06:27:13[diff] [blame]2189</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2190<dt class="hdlist1">
Junio C Hamanoa9499de2009-04-30 03:38:48[diff] [blame]2191core.createObject
Junio C Hamanoe91ea772009-04-26 01:41:41[diff] [blame]2192</dt>
2193<dd>
2194<p>
Junio C Hamanoa9499de2009-04-30 03:38:48[diff] [blame]2195 You can set this to <em>link</em>, in which case a hardlink followed by
2196 a delete of the source are used to make sure that object creation
2197 will not overwrite existing objects.
Junio C Hamanoe91ea772009-04-26 01:41:41[diff] [blame]2198</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2199<div class="paragraph"><p>On some file system/operating system combinations, this is unreliable.
Junio C Hamanoa9499de2009-04-30 03:38:48[diff] [blame]2200Set this config setting to <em>rename</em> there; However, This will remove the
2201check that makes sure that existing object files will not get overwritten.</p></div>
Junio C Hamanoe91ea772009-04-26 01:41:41[diff] [blame]2202</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2203<dt class="hdlist1">
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]2204core.notesRef
2205</dt>
2206<dd>
2207<p>
2208 When showing commit messages, also show notes which are stored in
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]2209 the given ref. The ref must be fully qualified. If the given
2210 ref does not exist, it is not an error but means that no
2211 notes should be printed.
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]2212</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2213<div class="paragraph"><p>This setting defaults to "refs/notes/commits", and it can be overridden by
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2214the <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]2215</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2216<dt class="hdlist1">
Junio C Hamano3c8d6702010-01-13 23:09:03[diff] [blame]2217core.sparseCheckout
2218</dt>
2219<dd>
2220<p>
2221 Enable "sparse checkout" feature. See section "Sparse checkout" in
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2222 <a href="git-read-tree.html">git-read-tree(1)</a> for more information.
Junio C Hamano3c8d6702010-01-13 23:09:03[diff] [blame]2223</p>
2224</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2225<dt class="hdlist1">
Junio C Hamano6371b0e2011-03-23 23:36:21[diff] [blame]2226core.abbrev
2227</dt>
2228<dd>
2229<p>
2230 Set the length object names are abbreviated to. If unspecified,
2231 many commands abbreviate to 7 hexdigits, which may not be enough
2232 for abbreviated object names to stay unique for sufficiently long
2233 time.
2234</p>
2235</dd>
2236<dt class="hdlist1">
Junio C Hamano3d141512009-06-01 01:22:40[diff] [blame]2237add.ignore-errors
2238</dt>
Junio C Hamano60186642010-12-02 14:18:26[diff] [blame]2239<dt class="hdlist1">
2240add.ignoreErrors
2241</dt>
Junio C Hamano3d141512009-06-01 01:22:40[diff] [blame]2242<dd>
2243<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2244 Tells <em>git add</em> to continue adding files when some files cannot be
Junio C Hamano3d141512009-06-01 01:22:40[diff] [blame]2245 added due to indexing errors. Equivalent to the <em>--ignore-errors</em>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2246 option of <a href="git-add.html">git-add(1)</a>. Older versions of Git accept only
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2247 <code>add.ignore-errors</code>, which does not follow the usual naming
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2248 convention for configuration variables. Newer versions of Git
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2249 honor <code>add.ignoreErrors</code> as well.
Junio C Hamano3d141512009-06-01 01:22:40[diff] [blame]2250</p>
2251</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2252<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2253alias.*
2254</dt>
2255<dd>
2256<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2257 Command aliases for the <a href="git.html">git(1)</a> command wrapper - e.g.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2258 after defining "alias.last = cat-file commit HEAD", the invocation
2259 "git last" is equivalent to "git cat-file commit HEAD". To avoid
2260 confusion and troubles with script usage, aliases that
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2261 hide existing Git commands are ignored. Arguments are split by
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2262 spaces, the usual shell quoting and escaping is supported.
2263 quote pair and a backslash can be used to quote them.
2264</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2265<div class="paragraph"><p>If the alias expansion is prefixed with an exclamation point,
Junio C Hamano9cb74f22007-02-12 04:15:05[diff] [blame]2266it will be treated as a shell command. For example, defining
2267"alias.new = !gitk --all --not ORIG_HEAD", the invocation
2268"git new" is equivalent to running the shell command
Junio C Hamano48bc1ce2009-07-09 16:49:19[diff] [blame]2269"gitk --all --not ORIG_HEAD". Note that shell commands will be
2270executed from the top-level directory of a repository, which may
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]2271not necessarily be the current directory.
2272<em>GIT_PREFIX</em> is set as returned by running <em>git rev-parse --show-prefix</em>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2273from the original current directory. See <a href="git-rev-parse.html">git-rev-parse(1)</a>.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2274</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2275<dt class="hdlist1">
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]2276am.keepcr
2277</dt>
2278<dd>
2279<p>
2280 If true, git-am will call git-mailsplit for patches in mbox format
2281 with parameter <em>--keep-cr</em>. In this case git-mailsplit will
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2282 not remove <code>\r</code> from lines ending with <code>\r\n</code>. Can be overridden
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]2283 by giving <em>--no-keep-cr</em> from the command line.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2284 See <a href="git-am.html">git-am(1)</a>, <a href="git-mailsplit.html">git-mailsplit(1)</a>.
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]2285</p>
2286</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2287<dt class="hdlist1">
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]2288apply.ignorewhitespace
2289</dt>
2290<dd>
2291<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2292 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]2293 whitespace, in the same way as the <em>--ignore-space-change</em>
2294 option.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2295 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]2296 respect all whitespace differences.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2297 See <a href="git-apply.html">git-apply(1)</a>.
Junio C Hamanofe24db02009-08-22 05:10:47[diff] [blame]2298</p>
2299</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2300<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2301apply.whitespace
2302</dt>
2303<dd>
2304<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2305 Tells <em>git apply</em> how to handle whitespaces, in the same way
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2306 as the <em>--whitespace</em> option. See <a href="git-apply.html">git-apply(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2307</p>
2308</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2309<dt class="hdlist1">
Junio C Hamano7fd84172007-05-24 07:00:32[diff] [blame]2310branch.autosetupmerge
2311</dt>
2312<dd>
2313<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2314 Tells <em>git branch</em> and <em>git checkout</em> to set up new branches
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2315 so that <a href="git-pull.html">git-pull(1)</a> will appropriately merge from the
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]2316 starting point branch. Note that even if this option is not set,
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2317 this behavior can be chosen per-branch using the <code>--track</code>
2318 and <code>--no-track</code> options. The valid settings are: <code>false</code>&#8201;&#8212;&#8201;no
2319 automatic setup is done; <code>true</code>&#8201;&#8212;&#8201;automatic setup is done when the
2320 starting point is a remote-tracking branch; <code>always</code>&#8201;&#8212;&#8201; automatic setup is done when the starting point is either a
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]2321 local branch or remote-tracking
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]2322 branch. This option defaults to true.
Junio C Hamano7fd84172007-05-24 07:00:32[diff] [blame]2323</p>
2324</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2325<dt class="hdlist1">
Junio C Hamano869bb802008-05-12 00:29:47[diff] [blame]2326branch.autosetuprebase
2327</dt>
2328<dd>
2329<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2330 When a new branch is created with <em>git branch</em> or <em>git checkout</em>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2331 that tracks another branch, this variable tells Git to set
Junio C Hamano869bb802008-05-12 00:29:47[diff] [blame]2332 up pull to rebase instead of merge (see "branch.&lt;name&gt;.rebase").
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2333 When <code>never</code>, rebase is never automatically set to true.
2334 When <code>local</code>, rebase is set to true for tracked branches of
Junio C Hamano869bb802008-05-12 00:29:47[diff] [blame]2335 other local branches.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2336 When <code>remote</code>, rebase is set to true for tracked branches of
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]2337 remote-tracking branches.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2338 When <code>always</code>, rebase will be set to true for all tracking
Junio C Hamano869bb802008-05-12 00:29:47[diff] [blame]2339 branches.
2340 See "branch.autosetupmerge" for details on how to set up a
2341 branch to track another branch.
2342 This option defaults to never.
2343</p>
2344</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2345<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2346branch.&lt;name&gt;.remote
2347</dt>
2348<dd>
2349<p>
Junio C Hamano63b6fdb2013-04-07 23:37:13[diff] [blame]2350 When on branch &lt;name&gt;, it tells <em>git fetch</em> and <em>git push</em>
2351 which remote to fetch from/push to. The remote to push to
2352 may be overridden with <code>remote.pushdefault</code> (for all branches).
2353 The remote to push to, for the current branch, may be further
2354 overridden by <code>branch.&lt;name&gt;.pushremote</code>. If no remote is
2355 configured, or if you are not on any branch, it defaults to
2356 <code>origin</code> for fetching and <code>remote.pushdefault</code> for pushing.
2357</p>
2358</dd>
2359<dt class="hdlist1">
2360branch.&lt;name&gt;.pushremote
2361</dt>
2362<dd>
2363<p>
2364 When on branch &lt;name&gt;, it overrides <code>branch.&lt;name&gt;.remote</code> for
2365 pushing. It also overrides <code>remote.pushdefault</code> for pushing
2366 from branch &lt;name&gt;. When you pull from one place (e.g. your
2367 upstream) and push to another place (e.g. your own publishing
2368 repository), you would want to set <code>remote.pushdefault</code> to
2369 specify the remote to push to for all branches, and use this
2370 option to override it for a specific branch.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2371</p>
2372</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2373<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2374branch.&lt;name&gt;.merge
2375</dt>
2376<dd>
2377<p>
Junio C Hamano0706c802009-03-30 22:34:19[diff] [blame]2378 Defines, together with branch.&lt;name&gt;.remote, the upstream branch
Junio C Hamanob02377c2011-04-28 22:26:02[diff] [blame]2379 for the given branch. It tells <em>git fetch</em>/<em>git pull</em>/<em>git rebase</em> which
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2380 branch to merge and can also affect <em>git push</em> (see push.default).
2381 When in branch &lt;name&gt;, it tells <em>git fetch</em> the default
Junio C Hamanoc2b47092007-10-25 06:50:31[diff] [blame]2382 refspec to be marked for merging in FETCH_HEAD. The value is
2383 handled like the remote part of a refspec, and must match a
2384 ref which is fetched from the remote given by
2385 "branch.&lt;name&gt;.remote".
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2386 The merge information is used by <em>git pull</em> (which at first calls
2387 <em>git fetch</em>) to lookup the default branch for merging. Without
2388 this option, <em>git pull</em> defaults to merge the first refspec fetched.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2389 Specify multiple values to get an octopus merge.
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2390 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]2391 another branch in the local repository, you can point
2392 branch.&lt;name&gt;.merge to the desired branch, and use the special setting
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2393 <code>.</code> (a period) for branch.&lt;name&gt;.remote.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2394</p>
2395</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2396<dt class="hdlist1">
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]2397branch.&lt;name&gt;.mergeoptions
2398</dt>
2399<dd>
2400<p>
2401 Sets default options for merging into branch &lt;name&gt;. The syntax and
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2402 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]2403 option values containing whitespace characters are currently not
2404 supported.
2405</p>
2406</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2407<dt class="hdlist1">
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]2408branch.&lt;name&gt;.rebase
2409</dt>
2410<dd>
2411<p>
2412 When true, rebase the branch &lt;name&gt; on top of the fetched branch,
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]2413 instead of merging the default branch from the default remote when
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]2414 "git pull" is run. See "pull.rebase" for doing this in a non
2415 branch-specific manner.
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]2416</p>
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]2417<div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2418it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a>
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]2419for details).</p></div>
Junio C Hamano0c999702007-12-03 09:57:55[diff] [blame]2420</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2421<dt class="hdlist1">
Junio C Hamano46247182013-01-09 20:50:28[diff] [blame]2422branch.&lt;name&gt;.description
2423</dt>
2424<dd>
2425<p>
2426 Branch description, can be edited with
2427 <code>git branch --edit-description</code>. Branch description is
2428 automatically added in the format-patch cover letter or
2429 request-pull summary.
2430</p>
2431</dd>
2432<dt class="hdlist1">
Junio C Hamano8760ea62008-03-14 08:58:45[diff] [blame]2433browser.&lt;tool&gt;.cmd
2434</dt>
2435<dd>
2436<p>
2437 Specify the command to invoke the specified browser. The
2438 specified command is evaluated in shell with the URLs passed
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2439 as arguments. (See <a href="git-web&#45;&#45;browse.html">git-web&#45;&#45;browse(1)</a>.)
Junio C Hamano8760ea62008-03-14 08:58:45[diff] [blame]2440</p>
2441</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2442<dt class="hdlist1">
Junio C Hamanoe35a6fc2008-01-29 09:46:27[diff] [blame]2443browser.&lt;tool&gt;.path
2444</dt>
2445<dd>
2446<p>
2447 Override the path for the given tool that may be used to
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2448 browse HTML help (see <em>-w</em> option in <a href="git-help.html">git-help(1)</a>) or a
2449 working repository in gitweb (see <a href="git-instaweb.html">git-instaweb(1)</a>).
Junio C Hamanoe35a6fc2008-01-29 09:46:27[diff] [blame]2450</p>
2451</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2452<dt class="hdlist1">
Junio C Hamano47b9acd2007-04-24 07:34:34[diff] [blame]2453clean.requireForce
2454</dt>
2455<dd>
2456<p>
Junio C Hamano422cfec2007-11-08 08:07:45[diff] [blame]2457 A boolean to make git-clean do nothing unless given -f
2458 or -n. Defaults to true.
Junio C Hamano47b9acd2007-04-24 07:34:34[diff] [blame]2459</p>
2460</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2461<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2462color.branch
2463</dt>
2464<dd>
2465<p>
2466 A boolean to enable/disable color in the output of
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2467 <a href="git-branch.html">git-branch(1)</a>. May be set to <code>always</code>,
2468 <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2469 only when the output is to a terminal. Defaults to false.
2470</p>
2471</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2472<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2473color.branch.&lt;slot&gt;
2474</dt>
2475<dd>
2476<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2477 Use customized color for branch coloration. <code>&lt;slot&gt;</code> is one of
2478 <code>current</code> (the current branch), <code>local</code> (a local branch),
Junio C Hamano76927822013-04-19 21:26:57[diff] [blame]2479 <code>remote</code> (a remote-tracking branch in refs/remotes/),
2480 <code>upstream</code> (upstream tracking branch), <code>plain</code> (other
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2481 refs).
2482</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2483<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]2484two) and attributes (at most one), separated by spaces. The colors
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2485accepted are <code>normal</code>, <code>black</code>, <code>red</code>, <code>green</code>, <code>yellow</code>, <code>blue</code>,
2486<code>magenta</code>, <code>cyan</code> and <code>white</code>; the attributes are <code>bold</code>, <code>dim</code>, <code>ul</code>,
2487<code>blink</code> and <code>reverse</code>. The first color given is the foreground; the
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2488second is the background. The position of the attribute, if any,
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2489doesn&#8217;t matter.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2490</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2491<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2492color.diff
2493</dt>
2494<dd>
2495<p>
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]2496 Whether to use ANSI escape sequences to add color to patches.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2497 If this is set to <code>always</code>, <a href="git-diff.html">git-diff(1)</a>,
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2498 <a href="git-log.html">git-log(1)</a>, and <a href="git-show.html">git-show(1)</a> will use color
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2499 for all patches. If it is set to <code>true</code> or <code>auto</code>, those
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]2500 commands will only use color when output is to the terminal.
2501 Defaults to false.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2502</p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2503<div class="paragraph"><p>This does not affect <a href="git-format-patch.html">git-format-patch(1)</a> nor the
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]2504<em>git-diff-&#42;</em> plumbing commands. Can be overridden on the
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2505command line with the <code>--color[=&lt;when&gt;]</code> option.</p></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]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]2508color.diff.&lt;slot&gt;
2509</dt>
2510<dd>
2511<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2512 Use customized color for diff colorization. <code>&lt;slot&gt;</code> specifies
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2513 which part of the patch to use the specified color, and is one
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2514 of <code>plain</code> (context text), <code>meta</code> (metainformation), <code>frag</code>
2515 (hunk header), <em>func</em> (function in hunk header), <code>old</code> (removed lines),
2516 <code>new</code> (added lines), <code>commit</code> (commit headers), or <code>whitespace</code>
Junio C Hamano2bd8a742009-12-01 21:16:59[diff] [blame]2517 (highlighting whitespace errors). The values of these variables may be
2518 specified as in color.branch.&lt;slot&gt;.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2519</p>
2520</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2521<dt class="hdlist1">
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]2522color.decorate.&lt;slot&gt;
2523</dt>
2524<dd>
2525<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2526 Use customized color for <em>git log --decorate</em> output. <code>&lt;slot&gt;</code> is one
2527 of <code>branch</code>, <code>remoteBranch</code>, <code>tag</code>, <code>stash</code> or <code>HEAD</code> for local
Junio C Hamano97bcb482010-11-25 03:16:07[diff] [blame]2528 branches, remote-tracking branches, tags, stash and HEAD, respectively.
Junio C Hamano7d449522010-07-01 00:08:51[diff] [blame]2529</p>
2530</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2531<dt class="hdlist1">
Junio C Hamanod257cff2009-03-18 05:27:16[diff] [blame]2532color.grep
2533</dt>
2534<dd>
2535<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2536 When set to <code>always</code>, always highlight matches. When <code>false</code> (or
2537 <code>never</code>), never. When set to <code>true</code> or <code>auto</code>, use color only
2538 when the output is written to the terminal. Defaults to <code>false</code>.
Junio C Hamanod257cff2009-03-18 05:27:16[diff] [blame]2539</p>
2540</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2541<dt class="hdlist1">
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2542color.grep.&lt;slot&gt;
Junio C Hamanod257cff2009-03-18 05:27:16[diff] [blame]2543</dt>
2544<dd>
2545<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2546 Use customized color for grep colorization. <code>&lt;slot&gt;</code> specifies which
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2547 part of the line to use the specified color, and is one of
Junio C Hamanod257cff2009-03-18 05:27:16[diff] [blame]2548</p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2549<div class="openblock">
2550<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2551<div class="dlist"><dl>
2552<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2553<code>context</code>
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2554</dt>
2555<dd>
2556<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2557 non-matching text in context lines (when using <code>-A</code>, <code>-B</code>, or <code>-C</code>)
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2558</p>
2559</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2560<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2561<code>filename</code>
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2562</dt>
2563<dd>
2564<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2565 filename prefix (when not using <code>-h</code>)
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2566</p>
2567</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2568<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2569<code>function</code>
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2570</dt>
2571<dd>
2572<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2573 function name lines (when using <code>-p</code>)
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2574</p>
2575</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2576<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2577<code>linenumber</code>
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2578</dt>
2579<dd>
2580<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2581 line number prefix (when using <code>-n</code>)
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2582</p>
2583</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2584<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2585<code>match</code>
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2586</dt>
2587<dd>
2588<p>
2589 matching text
2590</p>
2591</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2592<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2593<code>selected</code>
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2594</dt>
2595<dd>
2596<p>
2597 non-matching text in selected lines
2598</p>
2599</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2600<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2601<code>separator</code>
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2602</dt>
2603<dd>
2604<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2605 separators between fields on a line (<code>:</code>, <code>-</code>, and <code>=</code>)
2606 and between hunks (<code>--</code>)
Junio C Hamano0299d922010-03-20 20:59:31[diff] [blame]2607</p>
2608</dd>
2609</dl></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2610</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2611<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]2612</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2613<dt class="hdlist1">
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]2614color.interactive
2615</dt>
2616<dd>
2617<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2618 When set to <code>always</code>, always use colors for interactive prompts
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]2619 and displays (such as those used by "git-add --interactive").
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2620 When false (or <code>never</code>), never. When set to <code>true</code> or <code>auto</code>, use
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]2621 colors only when the output is to the terminal. Defaults to false.
2622</p>
2623</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2624<dt class="hdlist1">
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]2625color.interactive.&lt;slot&gt;
2626</dt>
2627<dd>
2628<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2629 Use customized color for <em>git add --interactive</em>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2630 output. <code>&lt;slot&gt;</code> may be <code>prompt</code>, <code>header</code>, <code>help</code> or <code>error</code>, for
Junio C Hamanoe5bf6c12009-02-07 21:43:10[diff] [blame]2631 four distinct types of normal output from interactive
Junio C Hamano27a128b2009-08-13 01:23:00[diff] [blame]2632 commands. The values of these variables may be specified as
Junio C Hamano00b8b632007-12-07 09:50:49[diff] [blame]2633 in color.branch.&lt;slot&gt;.
2634</p>
2635</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2636<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2637color.pager
2638</dt>
2639<dd>
2640<p>
2641 A boolean to enable/disable colored output when the pager is in
2642 use (default is true).
2643</p>
2644</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2645<dt class="hdlist1">
Junio C Hamano52ba2952009-05-18 17:43:02[diff] [blame]2646color.showbranch
2647</dt>
2648<dd>
2649<p>
2650 A boolean to enable/disable color in the output of
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2651 <a href="git-show-branch.html">git-show-branch(1)</a>. May be set to <code>always</code>,
2652 <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used
Junio C Hamano52ba2952009-05-18 17:43:02[diff] [blame]2653 only when the output is to a terminal. Defaults to false.
2654</p>
2655</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2656<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2657color.status
2658</dt>
2659<dd>
2660<p>
2661 A boolean to enable/disable color in the output of
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2662 <a href="git-status.html">git-status(1)</a>. May be set to <code>always</code>,
2663 <code>false</code> (or <code>never</code>) or <code>auto</code> (or <code>true</code>), in which case colors are used
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2664 only when the output is to a terminal. Defaults to false.
2665</p>
2666</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2667<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2668color.status.&lt;slot&gt;
2669</dt>
2670<dd>
2671<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2672 Use customized color for status colorization. <code>&lt;slot&gt;</code> is
2673 one of <code>header</code> (the header text of the status message),
2674 <code>added</code> or <code>updated</code> (files which are added but not committed),
2675 <code>changed</code> (files which are changed but not added in the index),
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]2676 <code>untracked</code> (files which are not tracked by Git),
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2677 <code>branch</code> (the current branch), or
2678 <code>nobranch</code> (the color the <em>no branch</em> warning is shown in, defaulting
Junio C Hamanob713ff12008-05-24 01:12:30[diff] [blame]2679 to red). The values of these variables may be specified as in
2680 color.branch.&lt;slot&gt;.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]2681</p>
2682</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2683<dt class="hdlist1">
Junio C Hamano83d46a22008-02-21 02:29:42[diff] [blame]2684color.ui
2685</dt>
2686<dd>
2687<p>
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]2688 This variable determines the default value for variables such
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2689 as <code>color.diff</code> and <code>color.grep</code> that control the use of color
Junio C Hamano5f2627d2011-05-06 20:23:48[diff] [blame]2690 per command family. Its scope will expand as more commands learn
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2691 configuration to set a default for the <code>--color</code> option. Set it
Junio C Hamanofa1d3492013-06-20 23:39:43[diff] [blame]2692 to <code>false</code> or <code>never</code> if you prefer Git commands not to use
2693 color unless enabled explicitly with some other configuration
2694 or the <code>--color</code> option. Set it to <code>always</code> if you want all
2695 output not intended for machine consumption to use color, to
2696 <code>true</code> or <code>auto</code> (this is the default since Git 1.8.4) if you
2697 want such output to use color when written to the terminal.
Junio C Hamano83d46a22008-02-21 02:29:42[diff] [blame]2698</p>
2699</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2700<dt class="hdlist1">
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2701column.ui
2702</dt>
2703<dd>
2704<p>
2705 Specify whether supported commands should output in columns.
2706 This variable consists of a list of tokens separated by spaces
2707 or commas:
2708</p>
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]2709<div class="paragraph"><p>These options control when the feature should be enabled
2710(defaults to <em>never</em>):</p></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2711<div class="openblock">
2712<div class="content">
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2713<div class="dlist"><dl>
2714<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2715<code>always</code>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2716</dt>
2717<dd>
2718<p>
2719 always show in columns
2720</p>
2721</dd>
2722<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2723<code>never</code>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2724</dt>
2725<dd>
2726<p>
2727 never show in columns
2728</p>
2729</dd>
2730<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2731<code>auto</code>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2732</dt>
2733<dd>
2734<p>
2735 show in columns if the output is to the terminal
2736</p>
2737</dd>
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]2738</dl></div>
2739</div></div>
2740<div class="paragraph"><p>These options control layout (defaults to <em>column</em>). Setting any
2741of these implies <em>always</em> if none of <em>always</em>, <em>never</em>, or <em>auto</em> are
2742specified.</p></div>
2743<div class="openblock">
2744<div class="content">
2745<div class="dlist"><dl>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2746<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2747<code>column</code>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2748</dt>
2749<dd>
2750<p>
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]2751 fill columns before rows
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2752</p>
2753</dd>
2754<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2755<code>row</code>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2756</dt>
2757<dd>
2758<p>
2759 fill rows before columns
2760</p>
2761</dd>
2762<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2763<code>plain</code>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2764</dt>
2765<dd>
2766<p>
2767 show in one column
2768</p>
2769</dd>
Junio C Hamanoa1952302013-07-01 21:31:18[diff] [blame]2770</dl></div>
2771</div></div>
2772<div class="paragraph"><p>Finally, these options can be combined with a layout option (defaults
2773to <em>nodense</em>):</p></div>
2774<div class="openblock">
2775<div class="content">
2776<div class="dlist"><dl>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2777<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2778<code>dense</code>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2779</dt>
2780<dd>
2781<p>
2782 make unequal size columns to utilize more space
2783</p>
2784</dd>
2785<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2786<code>nodense</code>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2787</dt>
2788<dd>
2789<p>
2790 make equal size columns
2791</p>
2792</dd>
2793</dl></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2794</div></div>
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2795</dd>
2796<dt class="hdlist1">
2797column.branch
2798</dt>
2799<dd>
2800<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2801 Specify whether to output branch listing in <code>git branch</code> in columns.
2802 See <code>column.ui</code> for details.
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2803</p>
2804</dd>
2805<dt class="hdlist1">
2806column.status
2807</dt>
2808<dd>
2809<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2810 Specify whether to output untracked files in <code>git status</code> in columns.
2811 See <code>column.ui</code> for details.
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2812</p>
2813</dd>
2814<dt class="hdlist1">
2815column.tag
2816</dt>
2817<dd>
2818<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2819 Specify whether to output tag listing in <code>git tag</code> in columns.
2820 See <code>column.ui</code> for details.
Junio C Hamano22700fb2012-05-03 23:07:25[diff] [blame]2821</p>
2822</dd>
2823<dt class="hdlist1">
Junio C Hamanoce836cc2013-01-21 02:01:53[diff] [blame]2824commit.cleanup
2825</dt>
2826<dd>
2827<p>
2828 This setting overrides the default of the <code>--cleanup</code> option in
2829 <code>git commit</code>. See <a href="git-commit.html">git-commit(1)</a> for details. Changing the
2830 default can be useful when you always want to keep lines that begin
2831 with comment character <code>#</code> in your log message, in which case you
2832 would do <code>git config commit.cleanup whitespace</code> (note that you will
2833 have to remove the help lines that begin with <code>#</code> in the commit log
2834 template yourself, if you do this).
2835</p>
2836</dd>
2837<dt class="hdlist1">
Junio C Hamanod0d892c2010-01-24 20:06:29[diff] [blame]2838commit.status
2839</dt>
2840<dd>
2841<p>
Junio C Hamano6ce6b6c2010-01-18 01:25:50[diff] [blame]2842 A boolean to enable/disable inclusion of status information in the
2843 commit message template when using an editor to prepare the commit
Junio C Hamanod0d892c2010-01-24 20:06:29[diff] [blame]2844 message. Defaults to true.
2845</p>
2846</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2847<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]2848commit.template
2849</dt>
2850<dd>
2851<p>
2852 Specify a file to use as the template for new commit messages.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2853 "<code>~/</code>" is expanded to the value of <code>$HOME</code> and "<code>~user/</code>" to the
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2854 specified user&#8217;s home directory.
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]2855</p>
2856</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2857<dt class="hdlist1">
Junio C Hamano0df92712011-12-21 22:30:44[diff] [blame]2858credential.helper
2859</dt>
2860<dd>
2861<p>
2862 Specify an external helper to be called when a username or
2863 password credential is needed; the helper may consult external
2864 storage to avoid prompting the user for the credentials. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2865 <a href="gitcredentials.html">gitcredentials(7)</a> for details.
Junio C Hamano0df92712011-12-21 22:30:44[diff] [blame]2866</p>
2867</dd>
2868<dt class="hdlist1">
2869credential.useHttpPath
2870</dt>
2871<dd>
2872<p>
2873 When acquiring credentials, consider the "path" component of an http
2874 or https URL to be important. Defaults to false. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2875 <a href="gitcredentials.html">gitcredentials(7)</a> for more information.
Junio C Hamano0df92712011-12-21 22:30:44[diff] [blame]2876</p>
2877</dd>
2878<dt class="hdlist1">
2879credential.username
2880</dt>
2881<dd>
2882<p>
2883 If no username is set for a network authentication, use this username
2884 by default. See credential.&lt;context&gt;.* below, and
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2885 <a href="gitcredentials.html">gitcredentials(7)</a>.
Junio C Hamano0df92712011-12-21 22:30:44[diff] [blame]2886</p>
2887</dd>
2888<dt class="hdlist1">
2889credential.&lt;url&gt;.*
2890</dt>
2891<dd>
2892<p>
2893 Any of the credential.* options above can be applied selectively to
2894 some credentials. For example "credential.https://example.com.username"
2895 would set the default username only for https connections to
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]2896 example.com. See <a href="gitcredentials.html">gitcredentials(7)</a> for details on how URLs are
Junio C Hamano0df92712011-12-21 22:30:44[diff] [blame]2897 matched.
2898</p>
2899</dd>
2900<dt class="hdlist1">
Junio C Hamanodbb64592007-09-01 11:17:39[diff] [blame]2901diff.autorefreshindex
2902</dt>
2903<dd>
2904<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2905 When using <em>git diff</em> to compare with work tree
Junio C Hamanodbb64592007-09-01 11:17:39[diff] [blame]2906 files, do not consider stat-only change as changed.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2907 Instead, silently run <code>git update-index --refresh</code> to
Junio C Hamanodbb64592007-09-01 11:17:39[diff] [blame]2908 update the cached stat information for paths whose
2909 contents in the work tree match the contents in the
2910 index. This option defaults to true. Note that this
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]2911 affects only <em>git diff</em> Porcelain, and not lower level
2912 <em>diff</em> commands such as <em>git diff-files</em>.
Junio C Hamanodbb64592007-09-01 11:17:39[diff] [blame]2913</p>
2914</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]2915<dt class="hdlist1">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2916diff.dirstat
2917</dt>
2918<dd>
2919<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2920 A comma separated list of <code>--dirstat</code> parameters specifying the
2921 default behavior of the <code>--dirstat</code> option to <a href="git-diff.html">git-diff(1)</a>`
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2922 and friends. The defaults can be overridden on the command line
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2923 (using <code>--dirstat=&lt;param1,param2,...&gt;</code>). The fallback defaults
2924 (when not changed by <code>diff.dirstat</code>) are <code>changes,noncumulative,3</code>.
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2925 The following parameters are available:
2926</p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2927<div class="openblock">
2928<div class="content">
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2929<div class="dlist"><dl>
2930<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2931<code>changes</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2932</dt>
2933<dd>
2934<p>
2935 Compute the dirstat numbers by counting the lines that have been
2936 removed from the source, or added to the destination. This ignores
2937 the amount of pure code movements within a file. In other words,
2938 rearranging lines in a file is not counted as much as other changes.
2939 This is the default behavior when no parameter is given.
2940</p>
2941</dd>
2942<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2943<code>lines</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2944</dt>
2945<dd>
2946<p>
2947 Compute the dirstat numbers by doing the regular line-based diff
2948 analysis, and summing the removed/added line counts. (For binary
2949 files, count 64-byte chunks instead, since binary files have no
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2950 natural concept of lines). This is a more expensive <code>--dirstat</code>
2951 behavior than the <code>changes</code> behavior, but it does count rearranged
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2952 lines within a file as much as other changes. The resulting output
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2953 is consistent with what you get from the other <code>--*stat</code> options.
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2954</p>
2955</dd>
2956<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2957<code>files</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2958</dt>
2959<dd>
2960<p>
2961 Compute the dirstat numbers by counting the number of files changed.
2962 Each changed file counts equally in the dirstat analysis. This is
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2963 the computationally cheapest <code>--dirstat</code> behavior, since it does
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2964 not have to look at the file contents at all.
2965</p>
2966</dd>
2967<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2968<code>cumulative</code>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2969</dt>
2970<dd>
2971<p>
2972 Count changes in a child directory for the parent directory as well.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2973 Note that when using <code>cumulative</code>, the sum of the percentages
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2974 reported may exceed 100%. The default (non-cumulative) behavior can
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2975 be specified with the <code>noncumulative</code> parameter.
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2976</p>
2977</dd>
2978<dt class="hdlist1">
2979&lt;limit&gt;
2980</dt>
2981<dd>
2982<p>
2983 An integer parameter specifies a cut-off percent (3% by default).
2984 Directories contributing less than this percentage of the changes
2985 are not shown in the output.
2986</p>
2987</dd>
2988</dl></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2989</div></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2990<div class="paragraph"><p>Example: The following will count changed files, while ignoring
2991directories with less than 10% of the total amount of changed files,
2992and accumulating child directory counts in the parent directories:
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]2993<code>files,10,cumulative</code>.</p></div>
Junio C Hamano1c222c52011-05-13 19:55:32[diff] [blame]2994</dd>
2995<dt class="hdlist1">
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]2996diff.statGraphWidth
2997</dt>
2998<dd>
2999<p>
3000 Limit the width of the graph part in --stat output. If set, applies
Junio C Hamano010705a2012-06-19 23:37:26[diff] [blame]3001 to all commands generating --stat output except format-patch.
Junio C Hamanoaea9e6b2012-03-07 00:17:11[diff] [blame]3002</p>
3003</dd>
3004<dt class="hdlist1">
Junio C Hamanoa1295452012-11-13 22:32:04[diff] [blame]3005diff.context
3006</dt>
3007<dd>
3008<p>
Junio C Hamano0766abc2012-12-08 00:08:56[diff] [blame]3009 Generate diffs with &lt;n&gt; lines of context instead of the default
3010 of 3. This value is overridden by the -U option.
Junio C Hamanoa1295452012-11-13 22:32:04[diff] [blame]3011</p>
Junio C Hamanoa1295452012-11-13 22:32:04[diff] [blame]3012</dd>
3013<dt class="hdlist1">
Junio C Hamano1fbbbc12007-12-18 07:01:27[diff] [blame]3014diff.external
3015</dt>
3016<dd>
3017<p>
3018 If this config variable is set, diff generation is not
3019 performed using the internal diff machinery, but using the
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3020 given command. Can be overridden with the &#8216;GIT_EXTERNAL_DIFF&#8217;
Junio C Hamano85c71572008-07-28 00:03:31[diff] [blame]3021 environment variable. The command is called with parameters
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3022 as described under "git Diffs" in <a href="git.html">git(1)</a>. Note: if
Junio C Hamano85c71572008-07-28 00:03:31[diff] [blame]3023 you want to use an external diff program only on a subset of
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3024 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]3025</p>
3026</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3027<dt class="hdlist1">
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3028diff.ignoreSubmodules
3029</dt>
3030<dd>
3031<p>
3032 Sets the default value of --ignore-submodules. Note that this
3033 affects only <em>git diff</em> Porcelain, and not lower level <em>diff</em>
3034 commands such as <em>git diff-files</em>. <em>git checkout</em> also honors
3035 this setting when reporting uncommitted changes.
3036</p>
3037</dd>
3038<dt class="hdlist1">
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]3039diff.mnemonicprefix
3040</dt>
3041<dd>
3042<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3043 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]3044 standard "a/" and "b/" depending on what is being compared. When
3045 this configuration is in effect, reverse diff output also swaps
3046 the order of the prefixes:
3047</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3048<div class="dlist"><dl>
3049<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3050<code>git diff</code>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]3051</dt>
3052<dd>
3053<p>
3054 compares the (i)ndex and the (w)ork tree;
3055</p>
3056</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3057<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3058<code>git diff HEAD</code>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]3059</dt>
3060<dd>
3061<p>
3062 compares a (c)ommit and the (w)ork tree;
3063</p>
3064</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3065<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3066<code>git diff --cached</code>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]3067</dt>
3068<dd>
3069<p>
3070 compares a (c)ommit and the (i)ndex;
3071</p>
3072</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3073<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3074<code>git diff HEAD:file1 file2</code>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]3075</dt>
3076<dd>
3077<p>
3078 compares an (o)bject and a (w)ork tree entity;
3079</p>
3080</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3081<dt class="hdlist1">
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3082<code>git diff --no-index a b</code>
Junio C Hamano5e4d8de2008-09-19 06:27:02[diff] [blame]3083</dt>
3084<dd>
3085<p>
3086 compares two non-git things (1) and (2).
3087</p>
3088</dd>
3089</dl></div>
3090</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3091<dt class="hdlist1">
Junio C Hamano21c2d142010-09-10 18:09:27[diff] [blame]3092diff.noprefix
3093</dt>
3094<dd>
3095<p>
3096 If set, <em>git diff</em> does not show any source or destination prefix.
3097</p>
3098</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3099<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3100diff.renameLimit
3101</dt>
3102<dd>
3103<p>
3104 The number of files to consider when performing the copy/rename
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3105 detection; equivalent to the <em>git diff</em> option <em>-l</em>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3106</p>
3107</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3108<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3109diff.renames
3110</dt>
3111<dd>
3112<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]3113 Tells Git to detect renames. If set to any boolean value, it
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3114 will enable basic rename detection. If set to "copies" or
3115 "copy", it will detect copies, as well.
3116</p>
3117</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3118<dt class="hdlist1">
Junio C Hamanobc4852e2009-01-21 10:51:14[diff] [blame]3119diff.suppressBlankEmpty
Junio C Hamanof1231492008-12-22 08:27:21[diff] [blame]3120</dt>
3121<dd>
3122<p>
3123 A boolean to inhibit the standard behavior of printing a space
3124 before each empty output line. Defaults to false.
3125</p>
3126</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3127<dt class="hdlist1">
Junio C Hamanob4e58b12012-11-26 03:13:06[diff] [blame]3128diff.submodule
3129</dt>
3130<dd>
3131<p>
3132 Specify the format in which differences in submodules are
3133 shown. The "log" format lists the commits in the range like
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3134 <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. The "short" format
Junio C Hamanob4e58b12012-11-26 03:13:06[diff] [blame]3135 format just shows the names of the commits at the beginning
3136 and end of the range. Defaults to short.
3137</p>
3138</dd>
3139<dt class="hdlist1">
3140diff.wordRegex
3141</dt>
3142<dd>
3143<p>
3144 A POSIX Extended Regular Expression used to determine what is a "word"
3145 when performing word-by-word difference calculations. Character
3146 sequences that match the regular expression are "words", all other
3147 characters are <strong>ignorable</strong> whitespace.
3148</p>
3149</dd>
3150<dt class="hdlist1">
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3151diff.&lt;driver&gt;.command
3152</dt>
3153<dd>
3154<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3155 The custom diff driver command. See <a href="gitattributes.html">gitattributes(5)</a>
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3156 for details.
3157</p>
3158</dd>
3159<dt class="hdlist1">
3160diff.&lt;driver&gt;.xfuncname
3161</dt>
3162<dd>
3163<p>
3164 The regular expression that the diff driver should use to
3165 recognize the hunk header. A built-in pattern may also be used.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3166 See <a href="gitattributes.html">gitattributes(5)</a> for details.
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3167</p>
3168</dd>
3169<dt class="hdlist1">
3170diff.&lt;driver&gt;.binary
3171</dt>
3172<dd>
3173<p>
3174 Set this option to true to make the diff driver treat files as
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3175 binary. See <a href="gitattributes.html">gitattributes(5)</a> for details.
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3176</p>
3177</dd>
3178<dt class="hdlist1">
3179diff.&lt;driver&gt;.textconv
3180</dt>
3181<dd>
3182<p>
3183 The command that the diff driver should call to generate the
3184 text-converted version of a file. The result of the
3185 conversion is used to generate a human-readable diff. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3186 <a href="gitattributes.html">gitattributes(5)</a> for details.
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3187</p>
3188</dd>
3189<dt class="hdlist1">
3190diff.&lt;driver&gt;.wordregex
3191</dt>
3192<dd>
3193<p>
3194 The regular expression that the diff driver should use to
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3195 split words in a line. See <a href="gitattributes.html">gitattributes(5)</a> for
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3196 details.
3197</p>
3198</dd>
3199<dt class="hdlist1">
3200diff.&lt;driver&gt;.cachetextconv
3201</dt>
3202<dd>
3203<p>
3204 Set this option to true to make the diff driver cache the text
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3205 conversion outputs. See <a href="gitattributes.html">gitattributes(5)</a> for details.
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3206</p>
3207</dd>
3208<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]3209diff.tool
3210</dt>
3211<dd>
3212<p>
Junio C Hamanob5e079f2013-02-08 00:02:52[diff] [blame]3213 Controls which diff tool is used by <a href="git-difftool.html">git-difftool(1)</a>.
3214 This variable overrides the value configured in <code>merge.tool</code>.
3215 The list below shows the valid built-in values.
3216 Any other value is treated as a custom diff tool and requires
3217 that a corresponding difftool.&lt;tool&gt;.cmd variable is defined.
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]3218</p>
Junio C Hamanob5e079f2013-02-08 00:02:52[diff] [blame]3219<div class="ulist"><ul>
3220<li>
3221<p>
3222araxis
3223</p>
3224</li>
3225<li>
3226<p>
3227bc3
3228</p>
3229</li>
3230<li>
3231<p>
3232codecompare
3233</p>
3234</li>
3235<li>
3236<p>
3237deltawalker
3238</p>
3239</li>
3240<li>
3241<p>
3242diffuse
3243</p>
3244</li>
3245<li>
3246<p>
3247ecmerge
3248</p>
3249</li>
3250<li>
3251<p>
3252emerge
3253</p>
3254</li>
3255<li>
3256<p>
3257gvimdiff
3258</p>
3259</li>
3260<li>
3261<p>
3262gvimdiff2
3263</p>
3264</li>
3265<li>
3266<p>
3267kdiff3
3268</p>
3269</li>
3270<li>
3271<p>
3272kompare
3273</p>
3274</li>
3275<li>
3276<p>
3277meld
3278</p>
3279</li>
3280<li>
3281<p>
3282opendiff
3283</p>
3284</li>
3285<li>
3286<p>
3287p4merge
3288</p>
3289</li>
3290<li>
3291<p>
3292tkdiff
3293</p>
3294</li>
3295<li>
3296<p>
3297vimdiff
3298</p>
3299</li>
3300<li>
3301<p>
3302vimdiff2
3303</p>
3304</li>
3305<li>
3306<p>
3307xxdiff
3308</p>
3309</li>
3310</ul></div>
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]3311</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3312<dt class="hdlist1">
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]3313diff.algorithm
3314</dt>
3315<dd>
3316<p>
3317 Choose a diff algorithm. The variants are as follows:
3318</p>
3319<div class="openblock">
3320<div class="content">
3321<div class="dlist"><dl>
3322<dt class="hdlist1">
3323<code>default</code>, <code>myers</code>
3324</dt>
3325<dd>
3326<p>
3327 The basic greedy diff algorithm. Currently, this is the default.
3328</p>
3329</dd>
3330<dt class="hdlist1">
3331<code>minimal</code>
3332</dt>
3333<dd>
3334<p>
3335 Spend extra time to make sure the smallest possible diff is
3336 produced.
3337</p>
3338</dd>
3339<dt class="hdlist1">
3340<code>patience</code>
3341</dt>
3342<dd>
3343<p>
3344 Use "patience diff" algorithm when generating patches.
3345</p>
3346</dd>
3347<dt class="hdlist1">
3348<code>histogram</code>
3349</dt>
3350<dd>
3351<p>
3352 This algorithm extends the patience algorithm to "support
3353 low-occurrence common elements".
3354</p>
3355</dd>
3356</dl></div>
3357</div></div>
3358</dd>
3359<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]3360difftool.&lt;tool&gt;.path
3361</dt>
3362<dd>
3363<p>
3364 Override the path for the given tool. This is useful in case
3365 your tool is not in the PATH.
3366</p>
3367</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3368<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]3369difftool.&lt;tool&gt;.cmd
3370</dt>
3371<dd>
3372<p>
3373 Specify the command to invoke the specified diff tool.
3374 The specified command is evaluated in shell with the following
3375 variables available: <em>LOCAL</em> is set to the name of the temporary
3376 file containing the contents of the diff pre-image and <em>REMOTE</em>
3377 is set to the name of the temporary file containing the contents
3378 of the diff post-image.
3379</p>
3380</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3381<dt class="hdlist1">
Junio C Hamano3bd66e92009-04-18 06:17:56[diff] [blame]3382difftool.prompt
3383</dt>
3384<dd>
3385<p>
3386 Prompt before each invocation of the diff tool.
3387</p>
3388</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3389<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]3390fetch.recurseSubmodules
3391</dt>
3392<dd>
3393<p>
Junio C Hamano5cd15182011-04-05 00:21:10[diff] [blame]3394 This option can be either set to a boolean value or to <em>on-demand</em>.
3395 Setting it to a boolean changes the behavior of fetch and pull to
3396 unconditionally recurse into submodules when set to true or to not
3397 recurse at all when set to false. When set to <em>on-demand</em> (the default
3398 value), fetch and pull will only recurse into a populated submodule
3399 when its superproject retrieves a commit that updates the submodule&#8217;s
3400 reference.
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]3401</p>
3402</dd>
3403<dt class="hdlist1">
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]3404fetch.fsckObjects
3405</dt>
3406<dd>
3407<p>
3408 If it is set to true, git-fetch-pack will check all fetched
3409 objects. It will abort in the case of a malformed object or a
3410 broken link. The result of an abort are only dangling objects.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3411 Defaults to false. If not set, the value of <code>transfer.fsckObjects</code>
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]3412 is used instead.
3413</p>
3414</dd>
3415<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3416fetch.unpackLimit
3417</dt>
3418<dd>
3419<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]3420 If the number of objects fetched over the Git native
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3421 transfer is below this
3422 limit, then the objects will be unpacked into loose object
3423 files. However if the number of received objects equals or
3424 exceeds this limit then the received pack will be stored as
3425 a pack, after adding any missing delta bases. Storing the
3426 pack from a push can make the push operation complete faster,
Junio C Hamanoe77b0152008-01-12 06:44:17[diff] [blame]3427 especially on slow filesystems. If not set, the value of
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3428 <code>transfer.unpackLimit</code> is used instead.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3429</p>
3430</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3431<dt class="hdlist1">
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]3432format.attach
3433</dt>
3434<dd>
3435<p>
3436 Enable multipart/mixed attachments as the default for
3437 <em>format-patch</em>. The value can also be a double quoted string
3438 which will enable attachments as the default and set the
3439 value as the boundary. See the --attach option in
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3440 <a href="git-format-patch.html">git-format-patch(1)</a>.
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]3441</p>
3442</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3443<dt class="hdlist1">
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]3444format.numbered
3445</dt>
3446<dd>
3447<p>
Junio C Hamano7d06a8a2008-10-20 05:42:33[diff] [blame]3448 A boolean which can enable or disable sequence numbers in patch
3449 subjects. It defaults to "auto" which enables it only if there
3450 is more than one patch. It can be enabled or disabled for all
3451 messages by setting it to "true" or "false". See --numbered
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3452 option in <a href="git-format-patch.html">git-format-patch(1)</a>.
Junio C Hamano8c5802d2007-11-15 00:13:36[diff] [blame]3453</p>
3454</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3455<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3456format.headers
3457</dt>
3458<dd>
3459<p>
3460 Additional email headers to include in a patch to be submitted
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3461 by mail. See <a href="git-format-patch.html">git-format-patch(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3462</p>
3463</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3464<dt class="hdlist1">
Junio C Hamano70664a02010-07-13 22:48:05[diff] [blame]3465format.to
3466</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3467<dt class="hdlist1">
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]3468format.cc
3469</dt>
3470<dd>
3471<p>
Junio C Hamano70664a02010-07-13 22:48:05[diff] [blame]3472 Additional recipients to include in a patch to be submitted
3473 by mail. See the --to and --cc options in
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3474 <a href="git-format-patch.html">git-format-patch(1)</a>.
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]3475</p>
3476</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3477<dt class="hdlist1">
Junio C Hamanof4581102009-04-25 08:29:59[diff] [blame]3478format.subjectprefix
3479</dt>
3480<dd>
3481<p>
3482 The default for format-patch is to output files with the <em>[PATCH]</em>
3483 subject prefix. Use this variable to change that prefix.
3484</p>
3485</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3486<dt class="hdlist1">
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]3487format.signature
3488</dt>
3489<dd>
3490<p>
3491 The default for format-patch is to output a signature containing
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]3492 the Git version number. Use this variable to change that default.
Junio C Hamano89a57342010-06-22 23:22:55[diff] [blame]3493 Set this variable to the empty string ("") to suppress
3494 signature generation.
3495</p>
3496</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3497<dt class="hdlist1">
Junio C Hamanod4c8e112007-03-04 10:32:38[diff] [blame]3498format.suffix
3499</dt>
3500<dd>
3501<p>
3502 The default for format-patch is to output files with the suffix
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3503 <code>.patch</code>. Use this variable to change that suffix (make sure to
Junio C Hamanod4c8e112007-03-04 10:32:38[diff] [blame]3504 include the dot if you want it).
3505</p>
3506</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3507<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]3508format.pretty
3509</dt>
3510<dd>
3511<p>
3512 The default pretty format for log/show/whatchanged command,
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3513 See <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>,
3514 <a href="git-whatchanged.html">git-whatchanged(1)</a>.
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]3515</p>
3516</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3517<dt class="hdlist1">
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]3518format.thread
3519</dt>
3520<dd>
3521<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3522 The default threading style for <em>git format-patch</em>. Can be
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3523 a boolean value, or <code>shallow</code> or <code>deep</code>. <code>shallow</code> threading
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]3524 makes every mail a reply to the head of the series,
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]3525 where the head is chosen from the cover letter, the
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3526 <code>--in-reply-to</code>, and the first patch mail, in this order.
3527 <code>deep</code> threading makes every mail a reply to the previous one.
3528 A true boolean value is the same as <code>shallow</code>, and a false
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]3529 value disables threading.
3530</p>
3531</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3532<dt class="hdlist1">
Junio C Hamano5f9a6f02009-04-06 08:26:56[diff] [blame]3533format.signoff
3534</dt>
3535<dd>
3536<p>
Junio C Hamano804a9742013-04-28 23:10:31[diff] [blame]3537 A boolean value which lets you enable the <code>-s/--signoff</code> option of
3538 format-patch by default. <strong>Note:</strong> Adding the Signed-off-by: line to a
3539 patch should be a conscious act and means that you certify you have
3540 the rights to submit this work under the same open source license.
3541 Please see the <em>SubmittingPatches</em> document for further discussion.
Junio C Hamano5f9a6f02009-04-06 08:26:56[diff] [blame]3542</p>
3543</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3544<dt class="hdlist1">
Junio C Hamanoea3b7522013-04-18 19:37:53[diff] [blame]3545format.coverLetter
3546</dt>
3547<dd>
3548<p>
3549 A boolean that controls whether to generate a cover-letter when
3550 format-patch is invoked, but in addition can be set to "auto", to
3551 generate a cover-letter only when there&#8217;s more than one patch.
3552</p>
3553</dd>
3554<dt class="hdlist1">
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3555filter.&lt;driver&gt;.clean
3556</dt>
3557<dd>
3558<p>
3559 The command which is used to convert the content of a worktree
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3560 file to a blob upon checkin. See <a href="gitattributes.html">gitattributes(5)</a> for
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3561 details.
3562</p>
3563</dd>
3564<dt class="hdlist1">
3565filter.&lt;driver&gt;.smudge
3566</dt>
3567<dd>
3568<p>
3569 The command which is used to convert the content of a blob
3570 object to a worktree file upon checkout. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3571 <a href="gitattributes.html">gitattributes(5)</a> for details.
Junio C Hamano209ebe82011-04-27 21:09:59[diff] [blame]3572</p>
3573</dd>
3574<dt class="hdlist1">
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]3575gc.aggressiveWindow
3576</dt>
3577<dd>
3578<p>
3579 The window size parameter used in the delta compression
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3580 algorithm used by <em>git gc --aggressive</em>. This defaults
Junio C Hamanob04bb3f2010-04-14 14:07:36[diff] [blame]3581 to 250.
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]3582</p>
3583</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3584<dt class="hdlist1">
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]3585gc.auto
3586</dt>
3587<dd>
3588<p>
3589 When there are approximately more than this many loose
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3590 objects in the repository, <code>git gc --auto</code> will pack them.
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]3591 Some Porcelain commands use this command to perform a
Junio C Hamanoe77b0152008-01-12 06:44:17[diff] [blame]3592 light-weight garbage collection from time to time. The
3593 default value is 6700. Setting this to 0 disables it.
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]3594</p>
3595</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3596<dt class="hdlist1">
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]3597gc.autopacklimit
3598</dt>
3599<dd>
3600<p>
3601 When there are more than this many packs that are not
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3602 marked with <code>*.keep</code> file in the repository, <code>git gc
3603 --auto</code> consolidates them into one larger pack. The
Junio C Hamano25c0b702008-03-23 09:41:37[diff] [blame]3604 default value is 50. Setting this to 0 disables it.
Junio C Hamano1b50ce92007-10-03 12:05:53[diff] [blame]3605</p>
3606</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3607<dt class="hdlist1">
Junio C Hamano9d52e572007-02-13 23:48:20[diff] [blame]3608gc.packrefs
3609</dt>
3610<dd>
3611<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3612 Running <code>git pack-refs</code> in a repository renders it
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]3613 unclonable by Git versions prior to 1.5.1.2 over dumb
3614 transports such as HTTP. This variable determines whether
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3615 <em>git gc</em> runs <code>git pack-refs</code>. This can be set to <code>notbare</code>
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]3616 to enable it within all non-bare repos or it can be set to a
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3617 boolean value. The default is <code>true</code>.
Junio C Hamano9d52e572007-02-13 23:48:20[diff] [blame]3618</p>
3619</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3620<dt class="hdlist1">
Junio C Hamano09a926d2008-03-13 07:55:29[diff] [blame]3621gc.pruneexpire
3622</dt>
3623<dd>
3624<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3625 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]3626 Override the grace period with this config variable. The value
3627 "now" may be used to disable this grace period and always prune
3628 unreachable objects immediately.
Junio C Hamano09a926d2008-03-13 07:55:29[diff] [blame]3629</p>
3630</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3631<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3632gc.reflogexpire
3633</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3634<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]3635gc.&lt;pattern&gt;.reflogexpire
3636</dt>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3637<dd>
3638<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3639 <em>git reflog expire</em> removes reflog entries older than
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]3640 this time; defaults to 90 days. With "&lt;pattern&gt;" (e.g.
3641 "refs/stash") in the middle the setting applies only to
3642 the refs that match the &lt;pattern&gt;.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3643</p>
3644</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3645<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3646gc.reflogexpireunreachable
3647</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3648<dt class="hdlist1">
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]3649gc.&lt;ref&gt;.reflogexpireunreachable
3650</dt>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3651<dd>
3652<p>
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3653 <em>git reflog expire</em> removes reflog entries older than
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3654 this time and are not reachable from the current tip;
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]3655 defaults to 30 days. With "&lt;pattern&gt;" (e.g. "refs/stash")
3656 in the middle, the setting applies only to the refs that
3657 match the &lt;pattern&gt;.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3658</p>
3659</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3660<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3661gc.rerereresolved
3662</dt>
3663<dd>
3664<p>
3665 Records of conflicted merge you resolved earlier are
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3666 kept for this many days when <em>git rerere gc</em> is run.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3667 The default is 60 days. See <a href="git-rerere.html">git-rerere(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3668</p>
3669</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3670<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3671gc.rerereunresolved
3672</dt>
3673<dd>
3674<p>
3675 Records of conflicted merge you have not resolved are
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]3676 kept for this many days when <em>git rerere gc</em> is run.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3677 The default is 15 days. See <a href="git-rerere.html">git-rerere(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3678</p>
3679</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3680<dt class="hdlist1">
Junio C Hamanoa3148f52009-01-14 08:49:57[diff] [blame]3681gitcvs.commitmsgannotation
3682</dt>
3683<dd>
3684<p>
3685 Append this string to each commit message. Set to empty string
3686 to disable this feature. Defaults to "via git-CVS emulator".
3687</p>
3688</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3689<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3690gitcvs.enabled
3691</dt>
3692<dd>
3693<p>
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]3694 Whether the CVS server interface is enabled for this repository.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3695 See <a href="git-cvsserver.html">git-cvsserver(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3696</p>
3697</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3698<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3699gitcvs.logfile
3700</dt>
3701<dd>
3702<p>
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]3703 Path to a log file where the CVS server interface well&#8230; logs
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3704 various stuff. See <a href="git-cvsserver.html">git-cvsserver(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]3705</p>
3706</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3707<dt class="hdlist1">
Junio C Hamano17bd2272008-09-01 06:11:17[diff] [blame]3708gitcvs.usecrlfattr
3709</dt>
3710<dd>
3711<p>
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]3712 If true, the server will look up the end-of-line conversion
3713 attributes for files to determine the <em>-k</em> modes to use. If
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]3714 the attributes force Git to treat a file as text,
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]3715 the <em>-k</em> mode will be left blank so CVS clients will
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]3716 treat it as text. If they suppress text conversion, the file
Junio C Hamanocb1c44f2008-08-06 06:19:33[diff] [blame]3717 will be set with <em>-kb</em> mode, which suppresses any newline munging
Junio C Hamanobb88cf42010-06-21 15:23:55[diff] [blame]3718 the client might otherwise do. If the attributes do not allow
3719 the file type to be determined, then <em>gitcvs.allbinary</em> is
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3720 used. See <a href="gitattributes.html">gitattributes(5)</a>.
Junio C Hamano17bd2272008-09-01 06:11:17[diff] [blame]3721</p>
3722</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3723<dt class="hdlist1">
Junio C Hamanod9e0e5d2007-04-14 16:22:04[diff] [blame]3724gitcvs.allbinary
3725</dt>
3726<dd>
3727<p>
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]3728 This is used if <em>gitcvs.usecrlfattr</em> does not resolve
3729 the correct <em>-kb</em> mode to use. If true, all
3730 unresolved files are sent to the client in
3731 mode <em>-kb</em>. This causes the client to treat them
3732 as binary files, which suppresses any newline munging it
3733 otherwise might do. Alternatively, if it is set to "guess",
3734 then the contents of the file are examined to decide if
3735 it is binary, similar to <em>core.autocrlf</em>.
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]3736</p>
3737</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3738<dt class="hdlist1">
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]3739gitcvs.dbname
3740</dt>
3741<dd>
3742<p>
3743 Database used by git-cvsserver to cache revision information
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]3744 derived from the Git repository. The exact meaning depends on the
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]3745 used database driver, for SQLite (which is the default driver) this
3746 is a filename. Supports variable substitution (see
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3747 <a href="git-cvsserver.html">git-cvsserver(1)</a> for details). May not contain semicolons (<code>;</code>).
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]3748 Default: <em>%Ggitcvs.%m.sqlite</em>
3749</p>
3750</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3751<dt class="hdlist1">
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]3752gitcvs.dbdriver
3753</dt>
3754<dd>
3755<p>
3756 Used Perl DBI driver. You can specify any available driver
3757 for this here, but it might not work. git-cvsserver is tested
3758 with <em>DBD::SQLite</em>, reported to work with <em>DBD::Pg</em>, and
3759 reported <strong>not</strong> to work with <em>DBD::mysql</em>. Experimental feature.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3760 May not contain double colons (<code>:</code>). Default: <em>SQLite</em>.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3761 See <a href="git-cvsserver.html">git-cvsserver(1)</a>.
Junio C Hamanod9e0e5d2007-04-14 16:22:04[diff] [blame]3762</p>
3763</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3764<dt class="hdlist1">
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]3765gitcvs.dbuser, gitcvs.dbpass
3766</dt>
3767<dd>
3768<p>
3769 Database user and password. Only useful if setting <em>gitcvs.dbdriver</em>,
3770 since SQLite has no concept of database users and/or passwords.
3771 <em>gitcvs.dbuser</em> supports variable substitution (see
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3772 <a href="git-cvsserver.html">git-cvsserver(1)</a> for details).
Junio C Hamanoa2ad99e2007-04-18 09:57:04[diff] [blame]3773</p>
3774</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3775<dt class="hdlist1">
Junio C Hamanoa74efce2008-04-02 08:39:08[diff] [blame]3776gitcvs.dbTableNamePrefix
3777</dt>
3778<dd>
3779<p>
3780 Database table name prefix. Prepended to the names of any
3781 database tables used, allowing a single database to be used
3782 for several repositories. Supports variable substitution (see
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3783 <a href="git-cvsserver.html">git-cvsserver(1)</a> for details). Any non-alphabetic
Junio C Hamanoa74efce2008-04-02 08:39:08[diff] [blame]3784 characters will be replaced with underscores.
3785</p>
3786</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3787</dl></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3788<div class="paragraph"><p>All gitcvs variables except for <em>gitcvs.usecrlfattr</em> and
Junio C Hamanodfccbb02008-05-26 01:16:14[diff] [blame]3789<em>gitcvs.allbinary</em> can also be specified as
3790<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]3791is one of "ext" and "pserver") to make them apply only for the given
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]3792access method.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3793<div class="dlist"><dl>
3794<dt class="hdlist1">
Junio C Hamano11821ed2011-10-19 18:42:09[diff] [blame]3795gitweb.category
3796</dt>
3797<dt class="hdlist1">
3798gitweb.description
3799</dt>
3800<dt class="hdlist1">
3801gitweb.owner
3802</dt>
3803<dt class="hdlist1">
3804gitweb.url
3805</dt>
3806<dd>
3807<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3808 See <a href="gitweb.html">gitweb(1)</a> for description.
Junio C Hamano11821ed2011-10-19 18:42:09[diff] [blame]3809</p>
3810</dd>
3811<dt class="hdlist1">
3812gitweb.avatar
3813</dt>
3814<dt class="hdlist1">
3815gitweb.blame
3816</dt>
3817<dt class="hdlist1">
3818gitweb.grep
3819</dt>
3820<dt class="hdlist1">
3821gitweb.highlight
3822</dt>
3823<dt class="hdlist1">
3824gitweb.patches
3825</dt>
3826<dt class="hdlist1">
3827gitweb.pickaxe
3828</dt>
3829<dt class="hdlist1">
3830gitweb.remote_heads
3831</dt>
3832<dt class="hdlist1">
3833gitweb.showsizes
3834</dt>
3835<dt class="hdlist1">
3836gitweb.snapshot
3837</dt>
3838<dd>
3839<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3840 See <a href="gitweb.conf.html">gitweb.conf(5)</a> for description.
Junio C Hamano11821ed2011-10-19 18:42:09[diff] [blame]3841</p>
3842</dd>
3843<dt class="hdlist1">
Junio C Hamanoa03ac862011-04-02 04:32:29[diff] [blame]3844grep.lineNumber
3845</dt>
3846<dd>
3847<p>
3848 If set to true, enable <em>-n</em> option by default.
3849</p>
3850</dd>
3851<dt class="hdlist1">
Junio C Hamanoa00504d2012-08-27 21:11:23[diff] [blame]3852grep.patternType
3853</dt>
3854<dd>
3855<p>
3856 Set the default matching behavior. Using a value of <em>basic</em>, <em>extended</em>,
3857 <em>fixed</em>, or <em>perl</em> will enable the <em>--basic-regexp</em>, <em>--extended-regexp</em>,
3858 <em>--fixed-strings</em>, or <em>--perl-regexp</em> option accordingly, while the
3859 value <em>default</em> will return to the default matching behavior.
3860</p>
3861</dd>
3862<dt class="hdlist1">
Junio C Hamanoa03ac862011-04-02 04:32:29[diff] [blame]3863grep.extendedRegexp
3864</dt>
3865<dd>
3866<p>
Junio C Hamanoa00504d2012-08-27 21:11:23[diff] [blame]3867 If set to true, enable <em>--extended-regexp</em> option by default. This
3868 option is ignored when the <em>grep.patternType</em> option is set to a value
3869 other than <em>default</em>.
Junio C Hamanoa03ac862011-04-02 04:32:29[diff] [blame]3870</p>
3871</dd>
3872<dt class="hdlist1">
Junio C Hamano4fd24422012-01-06 21:52:43[diff] [blame]3873gpg.program
3874</dt>
3875<dd>
3876<p>
3877 Use this custom program instead of "gpg" found on $PATH when
3878 making or verifying a PGP signature. The program must support the
3879 same command line interface as GPG, namely, to verify a detached
3880 signature, "gpg --verify $file - &lt;$signature" is run, and the
3881 program is expected to signal a good signature by exiting with
3882 code 0, and to generate an ascii-armored detached signature, the
3883 standard input of "gpg -bsau $key" is fed with the contents to be
3884 signed, and the program is expected to send the result to its
3885 standard output.
3886</p>
3887</dd>
3888<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3889gui.commitmsgwidth
3890</dt>
3891<dd>
3892<p>
3893 Defines how wide the commit message window is in the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3894 <a href="git-gui.html">git-gui(1)</a>. "75" is the default.
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3895</p>
3896</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3897<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3898gui.diffcontext
3899</dt>
3900<dd>
3901<p>
3902 Specifies how many context lines should be used in calls to diff
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3903 made by the <a href="git-gui.html">git-gui(1)</a>. The default is "5".
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3904</p>
3905</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3906<dt class="hdlist1">
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3907gui.encoding
3908</dt>
3909<dd>
3910<p>
3911 Specifies the default encoding to use for displaying of
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3912 file contents in <a href="git-gui.html">git-gui(1)</a> and <a href="gitk.html">gitk(1)</a>.
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3913 It can be overridden by setting the <em>encoding</em> attribute
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3914 for relevant files (see <a href="gitattributes.html">gitattributes(5)</a>).
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3915 If this option is not set, the tools default to the
3916 locale encoding.
3917</p>
3918</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3919<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3920gui.matchtrackingbranch
3921</dt>
3922<dd>
3923<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3924 Determines if new branches created with <a href="git-gui.html">git-gui(1)</a> should
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3925 default to tracking remote branches with matching names or
3926 not. Default: "false".
3927</p>
3928</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3929<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3930gui.newbranchtemplate
3931</dt>
3932<dd>
3933<p>
3934 Is used as suggested name when creating new branches using the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3935 <a href="git-gui.html">git-gui(1)</a>.
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3936</p>
3937</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3938<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3939gui.pruneduringfetch
3940</dt>
3941<dd>
3942<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3943 "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]3944 performing a fetch. The default value is "false".
3945</p>
3946</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3947<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3948gui.trustmtime
3949</dt>
3950<dd>
3951<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3952 Determines if <a href="git-gui.html">git-gui(1)</a> should trust the file modification
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3953 timestamp or not. By default the timestamps are not trusted.
3954</p>
3955</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3956<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3957gui.spellingdictionary
3958</dt>
3959<dd>
3960<p>
3961 Specifies the dictionary used for spell checking commit messages in
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3962 the <a href="git-gui.html">git-gui(1)</a>. When set to "none" spell checking is turned
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]3963 off.
3964</p>
3965</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3966<dt class="hdlist1">
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3967gui.fastcopyblame
3968</dt>
3969<dd>
3970<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3971 If true, <em>git gui blame</em> uses <code>-C</code> instead of <code>-C -C</code> for original
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3972 location detection. It makes blame significantly faster on huge
3973 repositories at the expense of less thorough copy detection.
3974</p>
3975</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3976<dt class="hdlist1">
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3977gui.copyblamethreshold
3978</dt>
3979<dd>
3980<p>
Junio C Hamano610d1762008-11-28 06:27:13[diff] [blame]3981 Specifies the threshold to use in <em>git gui blame</em> original location
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3982 detection, measured in alphanumeric characters. See the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]3983 <a href="git-blame.html">git-blame(1)</a> manual for more information on copy detection.
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3984</p>
3985</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3986<dt class="hdlist1">
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3987gui.blamehistoryctx
3988</dt>
3989<dd>
3990<p>
3991 Specifies the radius of history context in days to show in
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]3992 <a href="gitk.html">gitk(1)</a> for the selected commit, when the <code>Show History
3993 Context</code> menu item is invoked from <em>git gui blame</em>. If this
Junio C Hamanod3452a02008-11-15 08:07:55[diff] [blame]3994 variable is set to zero, the whole history is shown.
3995</p>
3996</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]3997<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]3998guitool.&lt;name&gt;.cmd
3999</dt>
4000<dd>
4001<p>
4002 Specifies the shell command line to execute when the corresponding item
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4003 of the <a href="git-gui.html">git-gui(1)</a> <code>Tools</code> menu is invoked. This option is
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4004 mandatory for every tool. The command is executed from the root of
4005 the working directory, and in the environment it receives the name of
4006 the tool as <em>GIT_GUITOOL</em>, the name of the currently selected file as
4007 <em>FILENAME</em>, and the name of the current branch as <em>CUR_BRANCH</em> (if
4008 the head is detached, <em>CUR_BRANCH</em> is empty).
4009</p>
4010</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4011<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4012guitool.&lt;name&gt;.needsfile
4013</dt>
4014<dd>
4015<p>
4016 Run the tool only if a diff is selected in the GUI. It guarantees
4017 that <em>FILENAME</em> is not empty.
4018</p>
4019</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4020<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4021guitool.&lt;name&gt;.noconsole
4022</dt>
4023<dd>
4024<p>
4025 Run the command silently, without creating a window to display its
4026 output.
4027</p>
4028</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4029<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4030guitool.&lt;name&gt;.norescan
4031</dt>
4032<dd>
4033<p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4034 Don&#8217;t rescan the working directory for changes after the tool
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4035 finishes execution.
4036</p>
4037</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4038<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4039guitool.&lt;name&gt;.confirm
4040</dt>
4041<dd>
4042<p>
4043 Show a confirmation dialog before actually running the tool.
4044</p>
4045</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4046<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4047guitool.&lt;name&gt;.argprompt
4048</dt>
4049<dd>
4050<p>
4051 Request a string argument from the user, and pass it to the tool
4052 through the <em>ARGS</em> environment variable. Since requesting an
4053 argument implies confirmation, the <em>confirm</em> option has no effect
4054 if this is enabled. If the option is set to <em>true</em>, <em>yes</em>, or <em>1</em>,
4055 the dialog uses a built-in generic prompt; otherwise the exact
4056 value of the variable is used.
4057</p>
4058</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4059<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4060guitool.&lt;name&gt;.revprompt
4061</dt>
4062<dd>
4063<p>
4064 Request a single valid revision from the user, and set the
4065 <em>REVISION</em> environment variable. In other aspects this option
4066 is similar to <em>argprompt</em>, and can be used together with it.
4067</p>
4068</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4069<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4070guitool.&lt;name&gt;.revunmerged
4071</dt>
4072<dd>
4073<p>
4074 Show only unmerged branches in the <em>revprompt</em> subdialog.
4075 This is useful for tools similar to merge or rebase, but not
4076 for things like checkout or reset.
4077</p>
4078</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4079<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4080guitool.&lt;name&gt;.title
4081</dt>
4082<dd>
4083<p>
4084 Specifies the title to use for the prompt dialog. The default
4085 is the tool name.
4086</p>
4087</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4088<dt class="hdlist1">
Junio C Hamano92d312a2008-12-15 07:22:20[diff] [blame]4089guitool.&lt;name&gt;.prompt
4090</dt>
4091<dd>
4092<p>
4093 Specifies the general prompt string to display at the top of
4094 the dialog, before subsections for <em>argprompt</em> and <em>revprompt</em>.
4095 The default value includes the actual command.
4096</p>
4097</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4098<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4099help.browser
4100</dt>
4101<dd>
4102<p>
4103 Specify the browser that will be used to display help in the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4104 <em>web</em> format. See <a href="git-help.html">git-help(1)</a>.
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4105</p>
4106</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4107<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4108help.format
4109</dt>
4110<dd>
4111<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4112 Override the default help format used by <a href="git-help.html">git-help(1)</a>.
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4113 Values <em>man</em>, <em>info</em>, <em>web</em> and <em>html</em> are supported. <em>man</em> is
4114 the default. <em>web</em> and <em>html</em> are the same.
4115</p>
4116</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4117<dt class="hdlist1">
Junio C Hamanof24b8062008-09-09 01:34:39[diff] [blame]4118help.autocorrect
4119</dt>
4120<dd>
4121<p>
4122 Automatically correct and execute mistyped commands after
4123 waiting for the given number of deciseconds (0.1 sec). If more
4124 than one command can be deduced from the entered text, nothing
4125 will be executed. If the value of this option is negative,
4126 the corrected command will be executed immediately. If the
4127 value is 0 - the command will be just shown but not executed.
4128 This is the default.
4129</p>
4130</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4131<dt class="hdlist1">
Junio C Hamano5dd5fae2013-01-18 21:06:49[diff] [blame]4132help.htmlpath
4133</dt>
4134<dd>
4135<p>
4136 Specify the path where the HTML documentation resides. File system paths
4137 and URLs are supported. HTML pages will be prefixed with this path when
4138 help is displayed in the <em>web</em> format. This defaults to the documentation
4139 path of your Git installation.
4140</p>
4141</dd>
4142<dt class="hdlist1">
Junio C Hamano58256872007-12-04 08:31:13[diff] [blame]4143http.proxy
4144</dt>
4145<dd>
4146<p>
Junio C Hamano3dd93922012-03-05 07:49:11[diff] [blame]4147 Override the HTTP proxy, normally configured using the <em>http_proxy</em>,
4148 <em>https_proxy</em>, and <em>all_proxy</em> environment variables (see
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4149 <code>curl(1)</code>). This can be overridden on a per-remote basis; see
Junio C Hamano3dd93922012-03-05 07:49:11[diff] [blame]4150 remote.&lt;name&gt;.proxy
Junio C Hamano58256872007-12-04 08:31:13[diff] [blame]4151</p>
4152</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4153<dt class="hdlist1">
Junio C Hamano4c4b0122011-06-30 01:19:32[diff] [blame]4154http.cookiefile
4155</dt>
4156<dd>
4157<p>
4158 File containing previously stored cookie lines which should be used
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4159 in the Git http session, if they match the server. The file format
Junio C Hamano4c4b0122011-06-30 01:19:32[diff] [blame]4160 of the file to read cookies from should be plain HTTP headers or
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4161 the Netscape/Mozilla cookie file format (see <a href="curl.html">curl(1)</a>).
Junio C Hamano4c4b0122011-06-30 01:19:32[diff] [blame]4162 NOTE that the file specified with http.cookiefile is only used as
4163 input. No cookies will be stored in the file.
4164</p>
4165</dd>
4166<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4167http.sslVerify
4168</dt>
4169<dd>
4170<p>
4171 Whether to verify the SSL certificate when fetching or pushing
4172 over HTTPS. Can be overridden by the <em>GIT_SSL_NO_VERIFY</em> environment
4173 variable.
4174</p>
4175</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4176<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4177http.sslCert
4178</dt>
4179<dd>
4180<p>
4181 File containing the SSL certificate when fetching or pushing
4182 over HTTPS. Can be overridden by the <em>GIT_SSL_CERT</em> environment
4183 variable.
4184</p>
4185</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4186<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4187http.sslKey
4188</dt>
4189<dd>
4190<p>
4191 File containing the SSL private key when fetching or pushing
4192 over HTTPS. Can be overridden by the <em>GIT_SSL_KEY</em> environment
4193 variable.
4194</p>
4195</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4196<dt class="hdlist1">
Junio C Hamano48bc1ce2009-07-09 16:49:19[diff] [blame]4197http.sslCertPasswordProtected
4198</dt>
4199<dd>
4200<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4201 Enable Git&#8217;s password prompt for the SSL certificate. Otherwise
Junio C Hamano48bc1ce2009-07-09 16:49:19[diff] [blame]4202 OpenSSL will prompt the user, possibly many times, if the
4203 certificate or private key is encrypted. Can be overridden by the
4204 <em>GIT_SSL_CERT_PASSWORD_PROTECTED</em> environment variable.
4205</p>
4206</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4207<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4208http.sslCAInfo
4209</dt>
4210<dd>
4211<p>
4212 File containing the certificates to verify the peer with when
4213 fetching or pushing over HTTPS. Can be overridden by the
4214 <em>GIT_SSL_CAINFO</em> environment variable.
4215</p>
4216</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4217<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4218http.sslCAPath
4219</dt>
4220<dd>
4221<p>
4222 Path containing files with the CA certificates to verify the peer
4223 with when fetching or pushing over HTTPS. Can be overridden
4224 by the <em>GIT_SSL_CAPATH</em> environment variable.
4225</p>
4226</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4227<dt class="hdlist1">
Junio C Hamano76927822013-04-19 21:26:57[diff] [blame]4228http.sslTry
4229</dt>
4230<dd>
4231<p>
4232 Attempt to use AUTH SSL/TLS and encrypted data transfers
4233 when connecting via regular FTP protocol. This might be needed
4234 if the FTP server requires it for security reasons or you wish
4235 to connect securely whenever remote FTP server supports it.
4236 Default is false since it might trigger certificate verification
4237 errors on misconfigured servers.
4238</p>
4239</dd>
4240<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4241http.maxRequests
4242</dt>
4243<dd>
4244<p>
4245 How many HTTP requests to launch in parallel. Can be overridden
4246 by the <em>GIT_HTTP_MAX_REQUESTS</em> environment variable. Default is 5.
4247</p>
4248</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4249<dt class="hdlist1">
Junio C Hamanob141a922010-01-10 19:55:14[diff] [blame]4250http.minSessions
4251</dt>
4252<dd>
4253<p>
4254 The number of curl sessions (counted across slots) to be kept across
4255 requests. They will not be ended with curl_easy_cleanup() until
4256 http_cleanup() is invoked. If USE_CURL_MULTI is not defined, this
4257 value will be capped at 1. Defaults to 1.
4258</p>
4259</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4260<dt class="hdlist1">
Junio C Hamano3b70d3c2009-11-21 17:37:37[diff] [blame]4261http.postBuffer
4262</dt>
4263<dd>
4264<p>
4265 Maximum size in bytes of the buffer used by smart HTTP
4266 transports when POSTing data to the remote system.
4267 For requests larger than this buffer size, HTTP/1.1 and
4268 Transfer-Encoding: chunked is used to avoid creating a
4269 massive pack file locally. Default is 1 MiB, which is
4270 sufficient for most requests.
4271</p>
4272</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4273<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4274http.lowSpeedLimit, http.lowSpeedTime
4275</dt>
4276<dd>
4277<p>
4278 If the HTTP transfer speed is less than <em>http.lowSpeedLimit</em>
4279 for longer than <em>http.lowSpeedTime</em> seconds, the transfer is aborted.
4280 Can be overridden by the <em>GIT_HTTP_LOW_SPEED_LIMIT</em> and
4281 <em>GIT_HTTP_LOW_SPEED_TIME</em> environment variables.
4282</p>
4283</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4284<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4285http.noEPSV
4286</dt>
4287<dd>
4288<p>
4289 A boolean which disables using of EPSV ftp command by curl.
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4290 This can helpful with some "poor" ftp servers which don&#8217;t
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4291 support EPSV mode. Can be overridden by the <em>GIT_CURL_FTP_NO_EPSV</em>
4292 environment variable. Default is false (curl will use EPSV).
4293</p>
4294</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4295<dt class="hdlist1">
Junio C Hamano53ba6d02010-08-22 07:25:12[diff] [blame]4296http.useragent
4297</dt>
4298<dd>
4299<p>
4300 The HTTP USER_AGENT string presented to an HTTP server. The default
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4301 value represents the version of the client Git such as git/1.7.1.
Junio C Hamano53ba6d02010-08-22 07:25:12[diff] [blame]4302 This option allows you to override this value to a more common value
4303 such as Mozilla/4.0. This may be necessary, for instance, if
4304 connecting through a firewall that restricts HTTP connections to a set
4305 of common USER_AGENT strings (but not including those like git/1.7.1).
4306 Can be overridden by the <em>GIT_HTTP_USER_AGENT</em> environment variable.
4307</p>
4308</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4309<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4310i18n.commitEncoding
4311</dt>
4312<dd>
4313<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4314 Character encoding the commit messages are stored in; Git itself
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4315 does not care per se, but this information is necessary e.g. when
4316 importing commits from emails or in the gitk graphical history
4317 browser (and possibly at other places in the future or in other
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4318 porcelains). See e.g. <a href="git-mailinfo.html">git-mailinfo(1)</a>. Defaults to <em>utf-8</em>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4319</p>
4320</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4321<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4322i18n.logOutputEncoding
4323</dt>
4324<dd>
4325<p>
4326 Character encoding the commit messages are converted to when
Junio C Hamano1aa40d22010-01-21 17:46:43[diff] [blame]4327 running <em>git log</em> and friends.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4328</p>
4329</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4330<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4331imap
4332</dt>
4333<dd>
4334<p>
4335 The configuration variables in the <em>imap</em> section are described
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4336 in <a href="git-imap-send.html">git-imap-send(1)</a>.
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4337</p>
4338</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4339<dt class="hdlist1">
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]4340init.templatedir
4341</dt>
4342<dd>
4343<p>
4344 Specify the directory from which templates will be copied.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4345 (See the "TEMPLATE DIRECTORY" section of <a href="git-init.html">git-init(1)</a>.)
Junio C Hamanocaa712a2010-03-11 01:17:35[diff] [blame]4346</p>
4347</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4348<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4349instaweb.browser
4350</dt>
4351<dd>
4352<p>
4353 Specify the program that will be used to browse your working
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4354 repository in gitweb. See <a href="git-instaweb.html">git-instaweb(1)</a>.
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4355</p>
4356</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4357<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4358instaweb.httpd
4359</dt>
4360<dd>
4361<p>
4362 The HTTP daemon command-line to start gitweb on your working
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4363 repository. See <a href="git-instaweb.html">git-instaweb(1)</a>.
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4364</p>
4365</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4366<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4367instaweb.local
4368</dt>
4369<dd>
4370<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4371 If true the web server started by <a href="git-instaweb.html">git-instaweb(1)</a> will
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4372 be bound to the local IP (127.0.0.1).
4373</p>
4374</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4375<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4376instaweb.modulepath
4377</dt>
4378<dd>
4379<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4380 The default module path for <a href="git-instaweb.html">git-instaweb(1)</a> to use
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]4381 instead of /usr/lib/apache2/modules. Only used if httpd
4382 is Apache.
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4383</p>
4384</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4385<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4386instaweb.port
4387</dt>
4388<dd>
4389<p>
4390 The port number to bind the gitweb httpd to. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4391 <a href="git-instaweb.html">git-instaweb(1)</a>.
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]4392</p>
4393</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4394<dt class="hdlist1">
Junio C Hamanoe5bf6c12009-02-07 21:43:10[diff] [blame]4395interactive.singlekey
4396</dt>
4397<dd>
4398<p>
Junio C Hamano27a128b2009-08-13 01:23:00[diff] [blame]4399 In interactive commands, allow the user to provide one-letter
Junio C Hamanoe5bf6c12009-02-07 21:43:10[diff] [blame]4400 input with a single key (i.e., without hitting enter).
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4401 Currently this is used by the <code>--patch</code> mode of
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4402 <a href="git-add.html">git-add(1)</a>, <a href="git-checkout.html">git-checkout(1)</a>, <a href="git-commit.html">git-commit(1)</a>,
4403 <a href="git-reset.html">git-reset(1)</a>, and <a href="git-stash.html">git-stash(1)</a>. Note that this
Junio C Hamano3d050d62011-05-17 06:43:34[diff] [blame]4404 setting is silently ignored if portable keystroke input
4405 is not available.
Junio C Hamanoe5bf6c12009-02-07 21:43:10[diff] [blame]4406</p>
4407</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4408<dt class="hdlist1">
Junio C Hamanof93530e2011-05-25 23:59:59[diff] [blame]4409log.abbrevCommit
4410</dt>
4411<dd>
4412<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4413 If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4414 <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--abbrev-commit</code>. You may
4415 override this option with <code>--no-abbrev-commit</code>.
Junio C Hamanof93530e2011-05-25 23:59:59[diff] [blame]4416</p>
4417</dd>
4418<dt class="hdlist1">
Junio C Hamanob713ff12008-05-24 01:12:30[diff] [blame]4419log.date
4420</dt>
4421<dd>
4422<p>
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]4423 Set the default date-time mode for the <em>log</em> command.
4424 Setting a value for log.date is similar to using <em>git log</em>'s
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4425 <code>--date</code> option. Possible values are <code>relative</code>, <code>local</code>,
4426 <code>default</code>, <code>iso</code>, <code>rfc</code>, and <code>short</code>; see <a href="git-log.html">git-log(1)</a>
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]4427 for details.
Junio C Hamanob713ff12008-05-24 01:12:30[diff] [blame]4428</p>
4429</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4430<dt class="hdlist1">
Junio C Hamanocb39aea2010-05-09 07:24:48[diff] [blame]4431log.decorate
4432</dt>
4433<dd>
4434<p>
4435 Print out the ref names of any commits that are shown by the log
4436 command. If <em>short</em> is specified, the ref name prefixes <em>refs/heads/</em>,
4437 <em>refs/tags/</em> and <em>refs/remotes/</em> will not be printed. If <em>full</em> is
4438 specified, the full ref name (including prefix) will be printed.
4439 This is the same as the log commands <em>--decorate</em> option.
4440</p>
4441</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4442<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4443log.showroot
4444</dt>
4445<dd>
4446<p>
4447 If true, the initial commit will be shown as a big creation event.
4448 This is equivalent to a diff against an empty tree.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4449 Tools like <a href="git-log.html">git-log(1)</a> or <a href="git-whatchanged.html">git-whatchanged(1)</a>, which
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4450 normally hide the root commit will now show it. True by default.
4451</p>
4452</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4453<dt class="hdlist1">
Junio C Hamanoce836cc2013-01-21 02:01:53[diff] [blame]4454log.mailmap
4455</dt>
4456<dd>
4457<p>
4458 If true, makes <a href="git-log.html">git-log(1)</a>, <a href="git-show.html">git-show(1)</a>, and
4459 <a href="git-whatchanged.html">git-whatchanged(1)</a> assume <code>--use-mailmap</code>.
4460</p>
4461</dd>
4462<dt class="hdlist1">
Junio C Hamano8bc410e2009-02-15 10:38:19[diff] [blame]4463mailmap.file
4464</dt>
4465<dd>
4466<p>
4467 The location of an augmenting mailmap file. The default
4468 mailmap, located in the root of the repository, is loaded
4469 first, then the mailmap file pointed to by this variable.
4470 The location of the mailmap file may be in a repository
4471 subdirectory, or somewhere outside of the repository itself.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4472 See <a href="git-shortlog.html">git-shortlog(1)</a> and <a href="git-blame.html">git-blame(1)</a>.
Junio C Hamano8bc410e2009-02-15 10:38:19[diff] [blame]4473</p>
4474</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4475<dt class="hdlist1">
Junio C Hamanoabad6da2013-01-06 09:06:32[diff] [blame]4476mailmap.blob
4477</dt>
4478<dd>
4479<p>
4480 Like <code>mailmap.file</code>, but consider the value as a reference to a
4481 blob in the repository. If both <code>mailmap.file</code> and
4482 <code>mailmap.blob</code> are given, both are parsed, with entries from
4483 <code>mailmap.file</code> taking precedence. In a bare repository, this
4484 defaults to <code>HEAD:.mailmap</code>. In a non-bare repository, it
4485 defaults to empty.
4486</p>
4487</dd>
4488<dt class="hdlist1">
Junio C Hamano8b588d52008-03-15 09:48:37[diff] [blame]4489man.viewer
4490</dt>
4491<dd>
4492<p>
4493 Specify the programs that may be used to display help in the
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4494 <em>man</em> format. See <a href="git-help.html">git-help(1)</a>.
Junio C Hamano8b588d52008-03-15 09:48:37[diff] [blame]4495</p>
4496</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4497<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4498man.&lt;tool&gt;.cmd
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]4499</dt>
4500<dd>
4501<p>
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4502 Specify the command to invoke the specified man viewer. The
4503 specified command is evaluated in shell with the man page
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4504 passed as argument. (See <a href="git-help.html">git-help(1)</a>.)
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4505</p>
4506</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4507<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4508man.&lt;tool&gt;.path
4509</dt>
4510<dd>
4511<p>
4512 Override the path for the given tool that may be used to
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4513 display help in the <em>man</em> format. See <a href="git-help.html">git-help(1)</a>.
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4514</p>
4515</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4516<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4517merge.conflictstyle
4518</dt>
4519<dd>
4520<p>
4521 Specify the style in which conflicted hunks are written out to
4522 working tree files upon merge. The default is "merge", which
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4523 shows a <code>&lt;&lt;&lt;&lt;&lt;&lt;&lt;</code> conflict marker, changes made by one side,
4524 a <code>=======</code> marker, changes made by the other side, and then
4525 a <code>&gt;&gt;&gt;&gt;&gt;&gt;&gt;</code> marker. An alternate style, "diff3", adds a <code>|||||||</code>
4526 marker and the original text before the <code>=======</code> marker.
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]4527</p>
4528</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4529<dt class="hdlist1">
Junio C Hamanoa03ac862011-04-02 04:32:29[diff] [blame]4530merge.defaultToUpstream
4531</dt>
4532<dd>
4533<p>
4534 If merge is called without any commit argument, merge the upstream
4535 branches configured for the current branch by using their last
Junio C Hamanoa1295452012-11-13 22:32:04[diff] [blame]4536 observed values stored in their remote-tracking branches.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4537 The values of the <code>branch.&lt;current branch&gt;.merge</code> that name the
4538 branches at the remote named by <code>branch.&lt;current branch&gt;.remote</code>
4539 are consulted, and then they are mapped via <code>remote.&lt;remote&gt;.fetch</code>
Junio C Hamanoa1295452012-11-13 22:32:04[diff] [blame]4540 to their corresponding remote-tracking branches, and the tips of
Junio C Hamanoa03ac862011-04-02 04:32:29[diff] [blame]4541 these tracking branches are merged.
4542</p>
4543</dd>
4544<dt class="hdlist1">
Junio C Hamano3d050d62011-05-17 06:43:34[diff] [blame]4545merge.ff
4546</dt>
4547<dd>
4548<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4549 By default, Git does not create an extra merge commit when merging
Junio C Hamano3d050d62011-05-17 06:43:34[diff] [blame]4550 a commit that is a descendant of the current commit. Instead, the
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4551 tip of the current branch is fast-forwarded. When set to <code>false</code>,
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4552 this variable tells Git to create an extra merge commit in such
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4553 a case (equivalent to giving the <code>--no-ff</code> option from the command
4554 line). When set to <code>only</code>, only such fast-forward merges are
4555 allowed (equivalent to giving the <code>--ff-only</code> option from the
Junio C Hamano3d050d62011-05-17 06:43:34[diff] [blame]4556 command line).
4557</p>
4558</dd>
4559<dt class="hdlist1">
Junio C Hamano6d76d612008-05-09 05:46:08[diff] [blame]4560merge.log
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4561</dt>
4562<dd>
4563<p>
Junio C Hamano3b4609d2010-09-30 00:04:34[diff] [blame]4564 In addition to branch names, populate the log message with at
4565 most the specified number of one-line descriptions from the
4566 actual commits that are being merged. Defaults to false, and
Junio C Hamano7165bf72011-01-04 22:06:18[diff] [blame]4567 true is a synonym for 20.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4568</p>
4569</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4570<dt class="hdlist1">
Junio C Hamano2fbcd212008-05-14 22:26:07[diff] [blame]4571merge.renameLimit
4572</dt>
4573<dd>
4574<p>
4575 The number of files to consider when performing rename detection
4576 during a merge; if not specified, defaults to the value of
4577 diff.renameLimit.
4578</p>
4579</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4580<dt class="hdlist1">
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]4581merge.renormalize
4582</dt>
4583<dd>
4584<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4585 Tell Git that canonical representation of files in the
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]4586 repository has changed over time (e.g. earlier commits record
4587 text files with CRLF line endings, but recent ones use LF line
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4588 endings). In such a repository, Git can convert the data
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]4589 recorded in commits to a canonical form before performing a
4590 merge to reduce unnecessary conflicts. For more information,
4591 see section "Merging branches with differing checkin/checkout
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4592 attributes" in <a href="gitattributes.html">gitattributes(5)</a>.
Junio C Hamano2db3e752010-09-03 21:33:06[diff] [blame]4593</p>
4594</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4595<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]4596merge.stat
4597</dt>
4598<dd>
4599<p>
4600 Whether to print the diffstat between ORIG_HEAD and the merge result
4601 at the end of the merge. True by default.
4602</p>
4603</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4604<dt class="hdlist1">
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]4605merge.tool
4606</dt>
4607<dd>
4608<p>
Junio C Hamanob5e079f2013-02-08 00:02:52[diff] [blame]4609 Controls which merge tool is used by <a href="git-mergetool.html">git-mergetool(1)</a>.
4610 The list below shows the valid built-in values.
4611 Any other value is treated as a custom merge tool and requires
4612 that a corresponding mergetool.&lt;tool&gt;.cmd variable is defined.
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]4613</p>
Junio C Hamanob5e079f2013-02-08 00:02:52[diff] [blame]4614<div class="ulist"><ul>
4615<li>
4616<p>
4617araxis
4618</p>
4619</li>
4620<li>
4621<p>
4622bc3
4623</p>
4624</li>
4625<li>
4626<p>
4627codecompare
4628</p>
4629</li>
4630<li>
4631<p>
4632deltawalker
4633</p>
4634</li>
4635<li>
4636<p>
4637diffuse
4638</p>
4639</li>
4640<li>
4641<p>
4642ecmerge
4643</p>
4644</li>
4645<li>
4646<p>
4647emerge
4648</p>
4649</li>
4650<li>
4651<p>
4652gvimdiff
4653</p>
4654</li>
4655<li>
4656<p>
4657gvimdiff2
4658</p>
4659</li>
4660<li>
4661<p>
4662kdiff3
4663</p>
4664</li>
4665<li>
4666<p>
4667meld
4668</p>
4669</li>
4670<li>
4671<p>
4672opendiff
4673</p>
4674</li>
4675<li>
4676<p>
4677p4merge
4678</p>
4679</li>
4680<li>
4681<p>
4682tkdiff
4683</p>
4684</li>
4685<li>
4686<p>
4687tortoisemerge
4688</p>
4689</li>
4690<li>
4691<p>
4692vimdiff
4693</p>
4694</li>
4695<li>
4696<p>
4697vimdiff2
4698</p>
4699</li>
4700<li>
4701<p>
4702xxdiff
4703</p>
4704</li>
4705</ul></div>
Junio C Hamano103ad7f2007-03-14 11:19:26[diff] [blame]4706</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4707<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4708merge.verbosity
4709</dt>
4710<dd>
4711<p>
4712 Controls the amount of output shown by the recursive merge
4713 strategy. Level 0 outputs nothing except a final error
4714 message if conflicts were detected. Level 1 outputs only
4715 conflicts, 2 outputs conflicts and file changes. Level 5 and
4716 above outputs debugging information. The default is level 2.
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]4717 Can be overridden by the <em>GIT_MERGE_VERBOSITY</em> environment variable.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4718</p>
4719</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4720<dt class="hdlist1">
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]4721merge.&lt;driver&gt;.name
4722</dt>
4723<dd>
4724<p>
Junio C Hamanoec87f522008-12-10 08:35:25[diff] [blame]4725 Defines a human-readable name for a custom low-level
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4726 merge driver. See <a href="gitattributes.html">gitattributes(5)</a> for details.
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]4727</p>
4728</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4729<dt class="hdlist1">
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]4730merge.&lt;driver&gt;.driver
4731</dt>
4732<dd>
4733<p>
4734 Defines the command that implements a custom low-level
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4735 merge driver. See <a href="gitattributes.html">gitattributes(5)</a> for details.
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]4736</p>
4737</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4738<dt class="hdlist1">
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]4739merge.&lt;driver&gt;.recursive
4740</dt>
4741<dd>
4742<p>
4743 Names a low-level merge driver to be used when
4744 performing an internal merge between common ancestors.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4745 See <a href="gitattributes.html">gitattributes(5)</a> for details.
Junio C Hamanoe90436a2007-04-22 07:22:13[diff] [blame]4746</p>
4747</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4748<dt class="hdlist1">
Junio C Hamano1fbbbc12007-12-18 07:01:27[diff] [blame]4749mergetool.&lt;tool&gt;.path
4750</dt>
4751<dd>
4752<p>
4753 Override the path for the given tool. This is useful in case
4754 your tool is not in the PATH.
4755</p>
4756</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4757<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]4758mergetool.&lt;tool&gt;.cmd
4759</dt>
4760<dd>
4761<p>
4762 Specify the command to invoke the specified merge tool. The
4763 specified command is evaluated in shell with the following
4764 variables available: <em>BASE</em> is the name of a temporary file
4765 containing the common base of the files to be merged, if available;
4766 <em>LOCAL</em> is the name of a temporary file containing the contents of
4767 the file on the current branch; <em>REMOTE</em> is the name of a temporary
4768 file containing the contents of the file from the branch being
4769 merged; <em>MERGED</em> contains the name of the file to which the merge
4770 tool should write the results of a successful merge.
4771</p>
4772</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4773<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]4774mergetool.&lt;tool&gt;.trustExitCode
4775</dt>
4776<dd>
4777<p>
4778 For a custom merge command, specify whether the exit code of
4779 the merge command can be used to determine whether the merge was
4780 successful. If this is not set to true then the merge target file
4781 timestamp is checked and the merge assumed to have been successful
4782 if the file has been updated, otherwise the user is prompted to
4783 indicate the success of the merge.
4784</p>
4785</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4786<dt class="hdlist1">
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]4787mergetool.keepBackup
4788</dt>
4789<dd>
4790<p>
4791 After performing a merge, the original file with conflict markers
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4792 can be saved as a file with a <code>.orig</code> extension. If this variable
4793 is set to <code>false</code> then this file is not preserved. Defaults to
4794 <code>true</code> (i.e. keep the backup files).
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]4795</p>
4796</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4797<dt class="hdlist1">
Junio C Hamano10b7a342009-01-01 22:05:17[diff] [blame]4798mergetool.keepTemporaries
4799</dt>
4800<dd>
4801<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4802 When invoking a custom merge tool, Git uses a set of temporary
Junio C Hamano10b7a342009-01-01 22:05:17[diff] [blame]4803 files to pass to the tool. If the tool returns an error and this
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4804 variable is set to <code>true</code>, then these temporary files will be
Junio C Hamano10b7a342009-01-01 22:05:17[diff] [blame]4805 preserved, otherwise they will be removed after the tool has
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4806 exited. Defaults to <code>false</code>.
Junio C Hamano10b7a342009-01-01 22:05:17[diff] [blame]4807</p>
4808</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4809<dt class="hdlist1">
Junio C Hamano10b7a342009-01-01 22:05:17[diff] [blame]4810mergetool.prompt
4811</dt>
4812<dd>
4813<p>
4814 Prompt before each invocation of the merge resolution program.
4815</p>
4816</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4817<dt class="hdlist1">
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4818notes.displayRef
4819</dt>
4820<dd>
4821<p>
4822 The (fully qualified) refname from which to show notes when
4823 showing commit messages. The value of this variable can be set
4824 to a glob, in which case notes from all matching refs will be
4825 shown. You may also specify this configuration variable
4826 several times. A warning will be issued for refs that do not
4827 exist, but a glob that does not match any refs is silently
4828 ignored.
4829</p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4830<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_DISPLAY_REF</code>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4831environment variable, which must be a colon separated list of refs or
4832globs.</p></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4833<div class="paragraph"><p>The effective value of "core.notesRef" (possibly overridden by
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4834GIT_NOTES_REF) is also implicitly added to the list of refs to be
4835displayed.</p></div>
4836</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4837<dt class="hdlist1">
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4838notes.rewrite.&lt;command&gt;
4839</dt>
4840<dd>
4841<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4842 When rewriting commits with &lt;command&gt; (currently <code>amend</code> or
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4843 <code>rebase</code>) and this variable is set to <code>true</code>, Git
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4844 automatically copies your notes from the original to the
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4845 rewritten commit. Defaults to <code>true</code>, but see
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4846 "notes.rewriteRef" below.
4847</p>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4848</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4849<dt class="hdlist1">
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4850notes.rewriteMode
4851</dt>
4852<dd>
4853<p>
4854 When copying notes during a rewrite (see the
4855 "notes.rewrite.&lt;command&gt;" option), determines what to do if
4856 the target commit already has a note. Must be one of
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4857 <code>overwrite</code>, <code>concatenate</code>, or <code>ignore</code>. Defaults to
4858 <code>concatenate</code>.
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4859</p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4860<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_MODE</code>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4861environment variable.</p></div>
4862</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4863<dt class="hdlist1">
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4864notes.rewriteRef
4865</dt>
4866<dd>
4867<p>
4868 When copying notes during a rewrite, specifies the (fully
4869 qualified) ref whose notes should be copied. The ref may be a
4870 glob, in which case notes in all matching refs will be copied.
4871 You may also specify this configuration several times.
4872</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4873<div class="paragraph"><p>Does not have a default value; you must configure this variable to
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4874enable note rewriting. Set it to <code>refs/notes/commits</code> to enable
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]4875rewriting for the default commit notes.</p></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4876<div class="paragraph"><p>This setting can be overridden with the <code>GIT_NOTES_REWRITE_REF</code>
Junio C Hamano2b3ee5d2010-05-08 05:41:18[diff] [blame]4877environment variable, which must be a colon separated list of refs or
4878globs.</p></div>
Junio C Hamano31667362010-03-25 00:38:53[diff] [blame]4879</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4880<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4881pack.window
4882</dt>
4883<dd>
4884<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4885 The size of the window used by <a href="git-pack-objects.html">git-pack-objects(1)</a> when no
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]4886 window size is given on the command line. Defaults to 10.
4887</p>
4888</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4889<dt class="hdlist1">
Junio C Hamano91d44c52007-05-09 07:16:07[diff] [blame]4890pack.depth
4891</dt>
4892<dd>
4893<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4894 The maximum delta depth used by <a href="git-pack-objects.html">git-pack-objects(1)</a> when no
Junio C Hamano91d44c52007-05-09 07:16:07[diff] [blame]4895 maximum depth is given on the command line. Defaults to 50.
4896</p>
4897</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4898<dt class="hdlist1">
Junio C Hamano235d53f2007-07-13 00:25:15[diff] [blame]4899pack.windowMemory
4900</dt>
4901<dd>
4902<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4903 The window memory size limit used by <a href="git-pack-objects.html">git-pack-objects(1)</a>
Junio C Hamano235d53f2007-07-13 00:25:15[diff] [blame]4904 when no limit is given on the command line. The value can be
4905 suffixed with "k", "m", or "g". Defaults to 0, meaning no
4906 limit.
4907</p>
4908</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4909<dt class="hdlist1">
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]4910pack.compression
4911</dt>
4912<dd>
4913<p>
4914 An integer -1..9, indicating the compression level for objects
4915 in a pack file. -1 is the zlib default. 0 means no
4916 compression, and 1..9 are various speed/size tradeoffs, 9 being
4917 slowest. If not set, defaults to core.compression. If that is
Junio C Hamano2e72a942007-11-21 08:54:42[diff] [blame]4918 not set, defaults to -1, the zlib default, which is "a default
4919 compromise between speed and compression (currently equivalent
4920 to level 6)."
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]4921</p>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4922<div class="paragraph"><p>Note that changing the compression level will not automatically recompress
Junio C Hamano657fd8a2010-10-07 00:01:24[diff] [blame]4923all existing objects. You can force recompression by passing the -F option
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4924to <a href="git-repack.html">git-repack(1)</a>.</p></div>
Junio C Hamanof2ce2972007-05-20 19:12:09[diff] [blame]4925</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4926<dt class="hdlist1">
Junio C Hamano679d22d2007-06-02 21:13:44[diff] [blame]4927pack.deltaCacheSize
4928</dt>
4929<dd>
4930<p>
Junio C Hamanoa6387422007-08-25 03:54:27[diff] [blame]4931 The maximum memory in bytes used for caching deltas in
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4932 <a href="git-pack-objects.html">git-pack-objects(1)</a> before writing them out to a pack.
Junio C Hamano9f883862009-08-11 06:23:52[diff] [blame]4933 This cache is used to speed up the writing object phase by not
4934 having to recompute the final delta result once the best match
4935 for all objects is found. Repacking large repositories on machines
4936 which are tight with memory might be badly impacted by this though,
4937 especially if this cache pushes the system into swapping.
4938 A value of 0 means no limit. The smallest size of 1 byte may be
4939 used to virtually disable this cache. Defaults to 256 MiB.
Junio C Hamano679d22d2007-06-02 21:13:44[diff] [blame]4940</p>
4941</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4942<dt class="hdlist1">
Junio C Hamano679d22d2007-06-02 21:13:44[diff] [blame]4943pack.deltaCacheLimit
4944</dt>
4945<dd>
4946<p>
Junio C Hamano58155b42007-09-15 07:46:14[diff] [blame]4947 The maximum size of a delta, that is cached in
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4948 <a href="git-pack-objects.html">git-pack-objects(1)</a>. This cache is used to speed up the
Junio C Hamano9f883862009-08-11 06:23:52[diff] [blame]4949 writing object phase by not having to recompute the final delta
4950 result once the best match for all objects is found. Defaults to 1000.
Junio C Hamano679d22d2007-06-02 21:13:44[diff] [blame]4951</p>
4952</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4953<dt class="hdlist1">
Junio C Hamano58155b42007-09-15 07:46:14[diff] [blame]4954pack.threads
4955</dt>
4956<dd>
4957<p>
4958 Specifies the number of threads to spawn when searching for best
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4959 delta matches. This requires that <a href="git-pack-objects.html">git-pack-objects(1)</a>
Junio C Hamano58155b42007-09-15 07:46:14[diff] [blame]4960 be compiled with pthreads otherwise this option is ignored with a
4961 warning. This is meant to reduce packing time on multiprocessor
4962 machines. The required amount of memory for the delta search window
4963 is however multiplied by the number of threads.
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4964 Specifying 0 will cause Git to auto-detect the number of CPU&#8217;s
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]4965 and set the number of threads accordingly.
Junio C Hamano58155b42007-09-15 07:46:14[diff] [blame]4966</p>
4967</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4968<dt class="hdlist1">
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]4969pack.indexVersion
4970</dt>
4971<dd>
4972<p>
4973 Specify the default pack index version. Valid values are 1 for
4974 legacy pack index used by Git versions prior to 1.5.2, and 2 for
4975 the new pack index with capabilities for packs larger than 4 GB
4976 as well as proper protection against the repacking of corrupted
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]4977 packs. Version 2 is the default. Note that version 2 is enforced
4978 and this config option ignored whenever the corresponding pack is
4979 larger than 2 GB.
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]4980</p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4981<div class="paragraph"><p>If you have an old Git that does not understand the version 2 <code>*.idx</code> file,
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]4982cloning or fetching over a non native protocol (e.g. "http" and "rsync")
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4983that will copy both <code>*.pack</code> file and corresponding <code>*.idx</code> file from the
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]4984other side may give you a repository that cannot be accessed with your
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]4985older version of Git. If the <code>*.pack</code> file is smaller than 2 GB, however,
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4986you can use <a href="git-index-pack.html">git-index-pack(1)</a> on the *.pack file to regenerate
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4987the <code>*.idx</code> file.</p></div>
Junio C Hamanod814b6d2007-11-04 11:13:49[diff] [blame]4988</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]4989<dt class="hdlist1">
Junio C Hamano09a926d2008-03-13 07:55:29[diff] [blame]4990pack.packSizeLimit
4991</dt>
4992<dd>
4993<p>
Junio C Hamano4d979582010-02-04 06:27:29[diff] [blame]4994 The maximum size of a pack. This setting only affects
4995 packing to a file when repacking, i.e. the git:// protocol
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]4996 is unaffected. It can be overridden by the <code>--max-pack-size</code>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]4997 option of <a href="git-repack.html">git-repack(1)</a>. The minimum size allowed is
Junio C Hamano4d979582010-02-04 06:27:29[diff] [blame]4998 limited to 1 MiB. The default is unlimited.
4999 Common unit suffixes of <em>k</em>, <em>m</em>, or <em>g</em> are
5000 supported.
Junio C Hamano09a926d2008-03-13 07:55:29[diff] [blame]5001</p>
5002</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5003<dt class="hdlist1">
Junio C Hamano9e96a1a2008-08-16 10:23:18[diff] [blame]5004pager.&lt;cmd&gt;
5005</dt>
5006<dd>
5007<p>
Junio C Hamano788eeba2010-12-08 22:50:43[diff] [blame]5008 If the value is boolean, turns on or off pagination of the
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]5009 output of a particular Git subcommand when writing to a tty.
Junio C Hamano788eeba2010-12-08 22:50:43[diff] [blame]5010 Otherwise, turns on pagination for the subcommand using the
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5011 pager specified by the value of <code>pager.&lt;cmd&gt;</code>. If <code>--paginate</code>
5012 or <code>--no-pager</code> is specified on the command line, it takes
Junio C Hamano788eeba2010-12-08 22:50:43[diff] [blame]5013 precedence over this option. To disable pagination for all
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5014 commands, set <code>core.pager</code> or <code>GIT_PAGER</code> to <code>cat</code>.
Junio C Hamano9e96a1a2008-08-16 10:23:18[diff] [blame]5015</p>
5016</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5017<dt class="hdlist1">
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]5018pretty.&lt;name&gt;
5019</dt>
5020<dd>
5021<p>
5022 Alias for a --pretty= format string, as specified in
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5023 <a href="git-log.html">git-log(1)</a>. Any aliases defined here can be used just
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]5024 as the built-in pretty formats could. For example,
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5025 running <code>git config pretty.changelog "format:* %H %s"</code>
5026 would cause the invocation <code>git log --pretty=changelog</code>
5027 to be equivalent to running <code>git log "--pretty=format:* %H %s"</code>.
Junio C Hamanoa574a092010-06-13 19:57:10[diff] [blame]5028 Note that an alias with the same name as a built-in format
5029 will be silently ignored.
5030</p>
5031</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5032<dt class="hdlist1">
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]5033pull.rebase
5034</dt>
5035<dd>
5036<p>
5037 When true, rebase branches on top of the fetched branch, instead
5038 of merging the default branch from the default remote when "git
5039 pull" is run. See "branch.&lt;name&gt;.rebase" for setting this on a
5040 per-branch basis.
5041</p>
5042<div class="paragraph"><p><strong>NOTE</strong>: this is a possibly dangerous operation; do <strong>not</strong> use
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5043it unless you understand the implications (see <a href="git-rebase.html">git-rebase(1)</a>
Junio C Hamano515ab1d2011-12-09 23:41:20[diff] [blame]5044for details).</p></div>
5045</dd>
5046<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5047pull.octopus
5048</dt>
5049<dd>
5050<p>
5051 The default merge strategy to use when pulling multiple branches
5052 at once.
5053</p>
5054</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5055<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5056pull.twohead
5057</dt>
5058<dd>
5059<p>
5060 The default merge strategy to use when pulling a single branch.
5061</p>
5062</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5063<dt class="hdlist1">
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5064push.default
5065</dt>
5066<dd>
5067<p>
Junio C Hamano58655592013-07-11 20:52:33[diff] [blame]5068 Defines the action <code>git push</code> should take if no refspec is
5069 explicitly given. Different values are well-suited for
5070 specific workflows; for instance, in a purely central workflow
5071 (i.e. the fetch source is equal to the push destination),
5072 <code>upstream</code> is probably what you want. Possible values are:
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5073</p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5074<div class="openblock">
5075<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5076<div class="ulist"><ul>
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5077<li>
5078<p>
Junio C Hamano58655592013-07-11 20:52:33[diff] [blame]5079<code>nothing</code> - do not push anything (error out) unless a refspec is
5080 explicitly given. This is primarily meant for people who want to
5081 avoid mistakes by always being explicit.
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5082</p>
5083</li>
5084<li>
5085<p>
Junio C Hamano58655592013-07-11 20:52:33[diff] [blame]5086<code>current</code> - push the current branch to update a branch with the same
5087 name on the receiving end. Works in both central and non-central
5088 workflows.
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5089</p>
5090</li>
5091<li>
5092<p>
Junio C Hamano58655592013-07-11 20:52:33[diff] [blame]5093<code>upstream</code> - push the current branch back to the branch whose
5094 changes are usually integrated into the current branch (which is
5095 called <code>@{upstream}</code>). This mode only makes sense if you are
5096 pushing to the same repository you would normally pull from
5097 (i.e. central workflow).
Junio C Hamano63c2bc92011-02-28 06:41:28[diff] [blame]5098</p>
5099</li>
5100<li>
5101<p>
Junio C Hamano58655592013-07-11 20:52:33[diff] [blame]5102<code>simple</code> - in centralized workflow, work like <code>upstream</code> with an
5103 added safety to refuse to push if the upstream branch&#8217;s name is
5104 different from the local one.
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5105</p>
Junio C Hamano58655592013-07-11 20:52:33[diff] [blame]5106<div class="paragraph"><p>When pushing to a remote that is different from the remote you normally
5107pull from, work as <code>current</code>. This is the safest option and is suited
5108for beginners.</p></div>
5109<div class="paragraph"><p>This mode will become the default in Git 2.0.</p></div>
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5110</li>
5111<li>
5112<p>
Junio C Hamano58655592013-07-11 20:52:33[diff] [blame]5113<code>matching</code> - push all branches having the same name on both ends.
5114 This makes the repository you are pushing to remember the set of
5115 branches that will be pushed out (e.g. if you always push <em>maint</em>
5116 and <em>master</em> there and no other branches, the repository you push
5117 to will have these two branches, and your local <em>maint</em> and
5118 <em>master</em> will be pushed there).
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5119</p>
Junio C Hamano58655592013-07-11 20:52:33[diff] [blame]5120<div class="paragraph"><p>To use this mode effectively, you have to make sure <em>all</em> the
5121branches you would push out are ready to be pushed out before
5122running <em>git push</em>, as the whole point of this mode is to allow you
5123to push all of the branches in one go. If you usually finish work
5124on only one branch and push out the result, while other branches are
5125unfinished, this mode is not for you. Also this mode is not
5126suitable for pushing into a shared central repository, as other
5127people may add new branches there, or update the tip of existing
5128branches outside your control.</p></div>
5129<div class="paragraph"><p>This is currently the default, but Git 2.0 will change the default
5130to <code>simple</code>.</p></div>
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5131</li>
5132</ul></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5133</div></div>
Junio C Hamano1de75722009-03-26 08:39:38[diff] [blame]5134</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5135<dt class="hdlist1">
Junio C Hamanoea6a7642009-03-11 23:56:19[diff] [blame]5136rebase.stat
5137</dt>
5138<dd>
5139<p>
5140 Whether to show a diffstat of what changed upstream since the last
5141 rebase. False by default.
5142</p>
5143</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5144<dt class="hdlist1">
Junio C Hamano075ae872010-09-01 18:43:07[diff] [blame]5145rebase.autosquash
5146</dt>
5147<dd>
5148<p>
5149 If set to true enable <em>--autosquash</em> option by default.
5150</p>
5151</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5152<dt class="hdlist1">
Junio C Hamanof1f5a7b2013-06-11 22:23:52[diff] [blame]5153rebase.autostash
5154</dt>
5155<dd>
5156<p>
5157 When set to true, automatically create a temporary stash
5158 before the operation begins, and apply it after the operation
5159 ends. This means that you can run rebase on a dirty worktree.
5160 However, use with care: the final stash application after a
5161 successful rebase might result in non-trivial conflicts.
5162 Defaults to false.
5163</p>
5164</dd>
5165<dt class="hdlist1">
Junio C Hamano621e1232009-10-26 05:16:47[diff] [blame]5166receive.autogc
5167</dt>
5168<dd>
5169<p>
5170 By default, git-receive-pack will run "git-gc --auto" after
5171 receiving data from git-push and updating refs. You can stop
5172 it by setting this variable to false.
5173</p>
5174</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5175<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5176receive.fsckObjects
5177</dt>
5178<dd>
5179<p>
5180 If it is set to true, git-receive-pack will check all received
5181 objects. It will abort in the case of a malformed object or a
5182 broken link. The result of an abort are only dangling objects.
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5183 Defaults to false. If not set, the value of <code>transfer.fsckObjects</code>
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]5184 is used instead.
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5185</p>
5186</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5187<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5188receive.unpackLimit
5189</dt>
5190<dd>
5191<p>
5192 If the number of objects received in a push is below this
5193 limit then the objects will be unpacked into loose object
5194 files. However if the number of received objects equals or
5195 exceeds this limit then the received pack will be stored as
5196 a pack, after adding any missing delta bases. Storing the
5197 pack from a push can make the push operation complete faster,
5198 especially on slow filesystems. If not set, the value of
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5199 <code>transfer.unpackLimit</code> is used instead.
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5200</p>
5201</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5202<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5203receive.denyDeletes
5204</dt>
5205<dd>
5206<p>
5207 If set to true, git-receive-pack will deny a ref update that deletes
5208 the ref. Use this to prevent such a ref deletion via a push.
5209</p>
5210</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5211<dt class="hdlist1">
Junio C Hamanob4448a82010-07-26 09:02:32[diff] [blame]5212receive.denyDeleteCurrent
5213</dt>
5214<dd>
5215<p>
5216 If set to true, git-receive-pack will deny a ref update that
5217 deletes the currently checked out branch of a non-bare repository.
5218</p>
5219</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5220<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5221receive.denyCurrentBranch
5222</dt>
5223<dd>
5224<p>
Junio C Hamanoe97d5772010-05-19 08:13:58[diff] [blame]5225 If set to true or "refuse", git-receive-pack will deny a ref update
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5226 to the currently checked out branch of a non-bare repository.
5227 Such a push is potentially dangerous because it brings the HEAD
5228 out of sync with the index and working tree. If set to "warn",
5229 print a warning of such a push to stderr, but allow the push to
5230 proceed. If set to false or "ignore", allow such pushes with no
Junio C Hamanoafb395b2010-03-17 22:16:15[diff] [blame]5231 message. Defaults to "refuse".
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5232</p>
5233</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5234<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5235receive.denyNonFastForwards
5236</dt>
5237<dd>
5238<p>
5239 If set to true, git-receive-pack will deny a ref update which is
Junio C Hamano3f680f32009-11-16 02:10:54[diff] [blame]5240 not a fast-forward. Use this to prevent such an update via a push,
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5241 even if that push is forced. This configuration variable is
5242 set when initializing a shared repository.
5243</p>
5244</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5245<dt class="hdlist1">
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]5246receive.hiderefs
5247</dt>
5248<dd>
5249<p>
5250 String(s) <code>receive-pack</code> uses to decide which refs to omit
5251 from its initial advertisement. Use more than one
5252 definitions to specify multiple prefix strings. A ref that
5253 are under the hierarchies listed on the value of this
5254 variable is excluded, and is hidden when responding to <code>git
5255 push</code>, and an attempt to update or delete a hidden ref by
5256 <code>git push</code> is rejected.
5257</p>
5258</dd>
5259<dt class="hdlist1">
Junio C Hamano621e1232009-10-26 05:16:47[diff] [blame]5260receive.updateserverinfo
5261</dt>
5262<dd>
5263<p>
5264 If set to true, git-receive-pack will run git-update-server-info
5265 after receiving data from git-push and updating refs.
5266</p>
5267</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5268<dt class="hdlist1">
Junio C Hamano63b6fdb2013-04-07 23:37:13[diff] [blame]5269remote.pushdefault
5270</dt>
5271<dd>
5272<p>
5273 The remote to push to by default. Overrides
5274 <code>branch.&lt;name&gt;.remote</code> for all branches, and is overridden by
5275 <code>branch.&lt;name&gt;.pushremote</code> for specific branches.
5276</p>
5277</dd>
5278<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5279remote.&lt;name&gt;.url
5280</dt>
5281<dd>
5282<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5283 The URL of a remote repository. See <a href="git-fetch.html">git-fetch(1)</a> or
5284 <a href="git-push.html">git-push(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5285</p>
5286</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5287<dt class="hdlist1">
Junio C Hamano0e88f3e2009-06-21 08:03:25[diff] [blame]5288remote.&lt;name&gt;.pushurl
5289</dt>
5290<dd>
5291<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5292 The push URL of a remote repository. See <a href="git-push.html">git-push(1)</a>.
Junio C Hamano0e88f3e2009-06-21 08:03:25[diff] [blame]5293</p>
5294</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5295<dt class="hdlist1">
Junio C Hamano58256872007-12-04 08:31:13[diff] [blame]5296remote.&lt;name&gt;.proxy
5297</dt>
5298<dd>
5299<p>
5300 For remotes that require curl (http, https and ftp), the URL to
5301 the proxy to use for that remote. Set to the empty string to
5302 disable proxying for that remote.
5303</p>
5304</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5305<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5306remote.&lt;name&gt;.fetch
5307</dt>
5308<dd>
5309<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5310 The default set of "refspec" for <a href="git-fetch.html">git-fetch(1)</a>. See
5311 <a href="git-fetch.html">git-fetch(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5312</p>
5313</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5314<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5315remote.&lt;name&gt;.push
5316</dt>
5317<dd>
5318<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5319 The default set of "refspec" for <a href="git-push.html">git-push(1)</a>. See
5320 <a href="git-push.html">git-push(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5321</p>
5322</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5323<dt class="hdlist1">
Junio C Hamano47d68a52008-05-06 06:35:40[diff] [blame]5324remote.&lt;name&gt;.mirror
5325</dt>
5326<dd>
5327<p>
5328 If true, pushing to this remote will automatically behave
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5329 as if the <code>--mirror</code> option was given on the command line.
Junio C Hamano47d68a52008-05-06 06:35:40[diff] [blame]5330</p>
5331</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5332<dt class="hdlist1">
Junio C Hamano118d2772007-02-21 20:24:10[diff] [blame]5333remote.&lt;name&gt;.skipDefaultUpdate
5334</dt>
5335<dd>
5336<p>
5337 If true, this remote will be skipped by default when updating
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5338 using <a href="git-fetch.html">git-fetch(1)</a> or the <code>update</code> subcommand of
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5339 <a href="git-remote.html">git-remote(1)</a>.
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]5340</p>
5341</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5342<dt class="hdlist1">
Junio C Hamano9df0c662009-11-23 11:09:27[diff] [blame]5343remote.&lt;name&gt;.skipFetchAll
5344</dt>
5345<dd>
5346<p>
5347 If true, this remote will be skipped by default when updating
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5348 using <a href="git-fetch.html">git-fetch(1)</a> or the <code>update</code> subcommand of
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5349 <a href="git-remote.html">git-remote(1)</a>.
Junio C Hamano118d2772007-02-21 20:24:10[diff] [blame]5350</p>
5351</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5352<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5353remote.&lt;name&gt;.receivepack
5354</dt>
5355<dd>
5356<p>
5357 The default program to execute on the remote side when pushing. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5358 option --receive-pack of <a href="git-push.html">git-push(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5359</p>
5360</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5361<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5362remote.&lt;name&gt;.uploadpack
5363</dt>
5364<dd>
5365<p>
5366 The default program to execute on the remote side when fetching. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5367 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]5368</p>
5369</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5370<dt class="hdlist1">
Junio C Hamano17dde0e2007-02-26 09:50:21[diff] [blame]5371remote.&lt;name&gt;.tagopt
5372</dt>
5373<dd>
5374<p>
Junio C Hamano86bcccc2008-03-08 09:33:55[diff] [blame]5375 Setting this value to --no-tags disables automatic tag following when
Junio C Hamanocc7636a2010-05-21 14:57:53[diff] [blame]5376 fetching from remote &lt;name&gt;. Setting it to --tags will fetch every
5377 tag from remote &lt;name&gt;, even if they are not reachable from remote
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5378 branch heads. Passing these flags directly to <a href="git-fetch.html">git-fetch(1)</a> can
Junio C Hamano075ae872010-09-01 18:43:07[diff] [blame]5379 override this setting. See options --tags and --no-tags of
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5380 <a href="git-fetch.html">git-fetch(1)</a>.
Junio C Hamano17dde0e2007-02-26 09:50:21[diff] [blame]5381</p>
5382</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5383<dt class="hdlist1">
Junio C Hamano096dde22009-12-26 23:14:11[diff] [blame]5384remote.&lt;name&gt;.vcs
5385</dt>
5386<dd>
5387<p>
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]5388 Setting this to a value &lt;vcs&gt; will cause Git to interact with
Junio C Hamano096dde22009-12-26 23:14:11[diff] [blame]5389 the remote with the git-remote-&lt;vcs&gt; helper.
5390</p>
5391</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5392<dt class="hdlist1">
Junio C Hamano118d2772007-02-21 20:24:10[diff] [blame]5393remotes.&lt;group&gt;
5394</dt>
5395<dd>
5396<p>
5397 The list of remotes which are fetched by "git remote update
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5398 &lt;group&gt;". See <a href="git-remote.html">git-remote(1)</a>.
Junio C Hamano118d2772007-02-21 20:24:10[diff] [blame]5399</p>
5400</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5401<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5402repack.usedeltabaseoffset
5403</dt>
5404<dd>
5405<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5406 By default, <a href="git-repack.html">git-repack(1)</a> creates packs that use
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]5407 delta-base offset. If you need to share your repository with
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]5408 Git older than version 1.4.4, either directly or via a dumb
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]5409 protocol such as http, then you need to set this option to
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]5410 "false" and repack. Access from old Git versions over the
Junio C Hamanofce7c7e2008-07-02 03:06:38[diff] [blame]5411 native protocol are unaffected by this option.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5412</p>
5413</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5414<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5415rerere.autoupdate
5416</dt>
5417<dd>
5418<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5419 When set to true, <code>git-rerere</code> updates the index with the
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5420 resulting contents after it cleanly resolves conflicts using
5421 previously recorded resolution. Defaults to false.
5422</p>
5423</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5424<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5425rerere.enabled
5426</dt>
5427<dd>
5428<p>
5429 Activate recording of resolved conflicts, so that identical
Junio C Hamano4fd24422012-01-06 21:52:43[diff] [blame]5430 conflict hunks can be resolved automatically, should they be
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5431 encountered again. By default, <a href="git-rerere.html">git-rerere(1)</a> is
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5432 enabled if there is an <code>rr-cache</code> directory under the
5433 <code>$GIT_DIR</code>, e.g. if "rerere" was previously used in the
Junio C Hamano864ba892012-01-13 17:42:05[diff] [blame]5434 repository.
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5435</p>
5436</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5437<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5438sendemail.identity
5439</dt>
5440<dd>
5441<p>
5442 A configuration identity. When given, causes values in the
5443 <em>sendemail.&lt;identity&gt;</em> subsection to take precedence over
5444 values in the <em>sendemail</em> section. The default identity is
5445 the value of <em>sendemail.identity</em>.
5446</p>
5447</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5448<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5449sendemail.smtpencryption
5450</dt>
5451<dd>
5452<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5453 See <a href="git-send-email.html">git-send-email(1)</a> for description. Note that this
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5454 setting is not subject to the <em>identity</em> mechanism.
5455</p>
5456</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5457<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5458sendemail.smtpssl
5459</dt>
5460<dd>
5461<p>
5462 Deprecated alias for <em>sendemail.smtpencryption = ssl</em>.
5463</p>
5464</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5465<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5466sendemail.&lt;identity&gt;.*
5467</dt>
5468<dd>
5469<p>
5470 Identity-specific versions of the <em>sendemail.*</em> parameters
5471 found below, taking precedence over those when the this
5472 identity is selected, through command-line or
5473 <em>sendemail.identity</em>.
5474</p>
5475</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5476<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5477sendemail.aliasesfile
5478</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5479<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5480sendemail.aliasfiletype
5481</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5482<dt class="hdlist1">
Junio C Hamanoea3b7522013-04-18 19:37:53[diff] [blame]5483sendemail.annotate
5484</dt>
5485<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5486sendemail.bcc
5487</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5488<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5489sendemail.cc
5490</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5491<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5492sendemail.cccmd
5493</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5494<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5495sendemail.chainreplyto
5496</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5497<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5498sendemail.confirm
5499</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5500<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5501sendemail.envelopesender
5502</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5503<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5504sendemail.from
5505</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5506<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5507sendemail.multiedit
5508</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5509<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5510sendemail.signedoffbycc
5511</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5512<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5513sendemail.smtppass
5514</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5515<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5516sendemail.suppresscc
5517</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5518<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5519sendemail.suppressfrom
5520</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5521<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5522sendemail.to
5523</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5524<dt class="hdlist1">
Junio C Hamanocb39aea2010-05-09 07:24:48[diff] [blame]5525sendemail.smtpdomain
5526</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5527<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5528sendemail.smtpserver
5529</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5530<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5531sendemail.smtpserverport
5532</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5533<dt class="hdlist1">
Junio C Hamano39c7a692010-10-27 06:08:54[diff] [blame]5534sendemail.smtpserveroption
5535</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5536<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5537sendemail.smtpuser
5538</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5539<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5540sendemail.thread
5541</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5542<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5543sendemail.validate
5544</dt>
5545<dd>
5546<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5547 See <a href="git-send-email.html">git-send-email(1)</a> for description.
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5548</p>
5549</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5550<dt class="hdlist1">
Junio C Hamano1bbd0f42009-07-23 06:20:29[diff] [blame]5551sendemail.signedoffcc
5552</dt>
5553<dd>
5554<p>
5555 Deprecated alias for <em>sendemail.signedoffbycc</em>.
5556</p>
5557</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5558<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5559showbranch.default
5560</dt>
5561<dd>
5562<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5563 The default set of branches for <a href="git-show-branch.html">git-show-branch(1)</a>.
5564 See <a href="git-show-branch.html">git-show-branch(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5565</p>
5566</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5567<dt class="hdlist1">
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]5568status.relativePaths
5569</dt>
5570<dd>
5571<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5572 By default, <a href="git-status.html">git-status(1)</a> shows paths relative to the
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5573 current directory. Setting this variable to <code>false</code> shows paths
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]5574 relative to the repository root (this was the default for Git
Junio C Hamano942b35e2007-12-09 10:19:33[diff] [blame]5575 prior to v1.5.4).
5576</p>
5577</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5578<dt class="hdlist1">
Junio C Hamano58655592013-07-11 20:52:33[diff] [blame]5579status.short
5580</dt>
5581<dd>
5582<p>
5583 Set to true to enable --short by default in <a href="git-status.html">git-status(1)</a>.
5584 The option --no-short takes precedence over this variable.
5585</p>
5586</dd>
5587<dt class="hdlist1">
5588status.branch
5589</dt>
5590<dd>
5591<p>
5592 Set to true to enable --branch by default in <a href="git-status.html">git-status(1)</a>.
5593 The option --no-branch takes precedence over this variable.
5594</p>
5595</dd>
5596<dt class="hdlist1">
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]5597status.showUntrackedFiles
5598</dt>
5599<dd>
5600<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5601 By default, <a href="git-status.html">git-status(1)</a> and <a href="git-commit.html">git-commit(1)</a> show
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]5602 files which are not currently tracked by Git. Directories which
5603 contain only untracked files, are shown with the directory name
5604 only. Showing untracked files means that Git needs to lstat() all
5605 all the files in the whole repository, which might be slow on some
5606 systems. So, this variable controls how the commands displays
5607 the untracked files. Possible values are:
5608</p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5609<div class="openblock">
5610<div class="content">
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5611<div class="ulist"><ul>
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]5612<li>
5613<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5614<code>no</code> - Show no untracked files.
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]5615</p>
5616</li>
5617<li>
5618<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5619<code>normal</code> - Show untracked files and directories.
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]5620</p>
5621</li>
5622<li>
5623<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5624<code>all</code> - Show also individual files in untracked directories.
Junio C Hamano4224f992008-06-23 07:14:08[diff] [blame]5625</p>
5626</li>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]5627</ul></div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5628</div></div>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5629<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]5630This variable can be overridden with the -u|--untracked-files option
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5631of <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]5632</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5633<dt class="hdlist1">
Junio C Hamanob671fb52010-06-01 05:06:14[diff] [blame]5634status.submodulesummary
5635</dt>
5636<dd>
5637<p>
5638 Defaults to false.
5639 If this is set to a non zero number or true (identical to -1 or an
5640 unlimited number), the submodule summary will be enabled and a
5641 summary of commits for modified submodules will be shown (see
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5642 --summary-limit option of <a href="git-submodule.html">git-submodule(1)</a>).
Junio C Hamanob671fb52010-06-01 05:06:14[diff] [blame]5643</p>
5644</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5645<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]5646submodule.&lt;name&gt;.path
5647</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5648<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]5649submodule.&lt;name&gt;.url
5650</dt>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5651<dt class="hdlist1">
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]5652submodule.&lt;name&gt;.update
5653</dt>
5654<dd>
5655<p>
5656 The path within this project, URL, and the updating strategy
5657 for a submodule. These variables are initially populated
5658 by <em>git submodule init</em>; edit them to override the
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5659 URL and other values found in the <code>.gitmodules</code> file. See
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5660 <a href="git-submodule.html">git-submodule(1)</a> and <a href="gitmodules.html">gitmodules(5)</a> for details.
Junio C Hamano78e3a782010-07-15 22:24:45[diff] [blame]5661</p>
5662</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5663<dt class="hdlist1">
Junio C Hamanoabad6da2013-01-06 09:06:32[diff] [blame]5664submodule.&lt;name&gt;.branch
5665</dt>
5666<dd>
5667<p>
5668 The remote branch name for a submodule, used by <code>git submodule
5669 update --remote</code>. Set this option to override the value found in
5670 the <code>.gitmodules</code> file. See <a href="git-submodule.html">git-submodule(1)</a> and
5671 <a href="gitmodules.html">gitmodules(5)</a> for details.
5672</p>
5673</dd>
5674<dt class="hdlist1">
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]5675submodule.&lt;name&gt;.fetchRecurseSubmodules
5676</dt>
5677<dd>
5678<p>
Junio C Hamano5cd15182011-04-05 00:21:10[diff] [blame]5679 This option can be used to control recursive fetching of this
Junio C Hamano7165bf72011-01-04 22:06:18[diff] [blame]5680 submodule. It can be overridden by using the --[no-]recurse-submodules
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]5681 command line option to "git fetch" and "git pull".
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5682 This setting will override that from in the <a href="gitmodules.html">gitmodules(5)</a>
Junio C Hamano0d75e872010-12-17 06:57:26[diff] [blame]5683 file.
5684</p>
5685</dd>
5686<dt class="hdlist1">
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]5687submodule.&lt;name&gt;.ignore
5688</dt>
5689<dd>
5690<p>
5691 Defines under what circumstances "git status" and the diff family show
5692 a submodule as modified. When set to "all", it will never be considered
5693 modified, "dirty" will ignore all changes to the submodules work tree and
5694 takes only differences between the HEAD of the submodule and the commit
5695 recorded in the superproject into account. "untracked" will additionally
5696 let submodules with modified tracked files in their work tree show up.
5697 Using "none" (the default when this option is not set) also shows
5698 submodules that have untracked files in their work tree as changed.
5699 This setting overrides any setting made in .gitmodules for this submodule,
Junio C Hamanode9745c2010-08-23 17:10:18[diff] [blame]5700 both settings can be overridden on the command line by using the
Junio C Hamano619596a2010-08-18 22:15:35[diff] [blame]5701 "--ignore-submodules" option.
5702</p>
5703</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5704<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5705tar.umask
5706</dt>
5707<dd>
5708<p>
Junio C Hamanobdebabb2007-08-23 00:25:09[diff] [blame]5709 This variable can be used to restrict the permission bits of
5710 tar archive entries. The default is 0002, which turns off the
5711 world write bit. The special value "user" indicates that the
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5712 archiving user&#8217;s umask will be used instead. See umask(2) and
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5713 <a href="git-archive.html">git-archive(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5714</p>
5715</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5716<dt class="hdlist1">
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]5717transfer.fsckObjects
5718</dt>
5719<dd>
5720<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5721 When <code>fetch.fsckObjects</code> or <code>receive.fsckObjects</code> are
Junio C Hamano8fb66e52011-10-05 20:59:51[diff] [blame]5722 not set, the value of this variable is used instead.
5723 Defaults to false.
5724</p>
5725</dd>
5726<dt class="hdlist1">
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]5727transfer.hiderefs
5728</dt>
5729<dd>
5730<p>
5731 This variable can be used to set both <code>receive.hiderefs</code>
5732 and <code>uploadpack.hiderefs</code> at the same time to the same
5733 values. See entries for these other variables.
5734</p>
5735</dd>
5736<dt class="hdlist1">
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5737transfer.unpackLimit
5738</dt>
5739<dd>
5740<p>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5741 When <code>fetch.unpackLimit</code> or <code>receive.unpackLimit</code> are
Junio C Hamano4653c6f2008-11-26 22:50:20[diff] [blame]5742 not set, the value of this variable is used instead.
5743 The default value is 100.
5744</p>
5745</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5746<dt class="hdlist1">
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]5747uploadpack.hiderefs
5748</dt>
5749<dd>
5750<p>
5751 String(s) <code>upload-pack</code> uses to decide which refs to omit
5752 from its initial advertisement. Use more than one
5753 definitions to specify multiple prefix strings. A ref that
5754 are under the hierarchies listed on the value of this
5755 variable is excluded, and is hidden from <code>git ls-remote</code>,
5756 <code>git fetch</code>, etc. An attempt to fetch a hidden ref by <code>git
Junio C Hamano5e7f1312013-03-21 22:49:01[diff] [blame]5757 fetch</code> will fail. See also <code>uploadpack.allowtipsha1inwant</code>.
5758</p>
5759</dd>
5760<dt class="hdlist1">
5761uploadpack.allowtipsha1inwant
5762</dt>
5763<dd>
5764<p>
5765 When <code>uploadpack.hiderefs</code> is in effect, allow <code>upload-pack</code>
5766 to accept a fetch request that asks for an object at the tip
5767 of a hidden ref (by default, such a request is rejected).
5768 see also <code>uploadpack.hiderefs</code>.
Junio C Hamano80ad00d2013-02-18 00:19:03[diff] [blame]5769</p>
5770</dd>
5771<dt class="hdlist1">
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]5772url.&lt;base&gt;.insteadOf
5773</dt>
5774<dd>
5775<p>
5776 Any URL that starts with this value will be rewritten to
5777 start, instead, with &lt;base&gt;. In cases where some site serves a
5778 large number of repositories, and serves them with multiple
5779 access methods, and some users need to use different access
5780 methods, this feature allows people to specify any of the
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]5781 equivalent URLs and have Git automatically rewrite the URL to
Junio C Hamano24bc09a2008-02-28 00:27:44[diff] [blame]5782 the best alternative for the particular user, even for a
5783 never-before-seen repository on the site. When more than one
5784 insteadOf strings match a given URL, the longest match is used.
5785</p>
5786</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5787<dt class="hdlist1">
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]5788url.&lt;base&gt;.pushInsteadOf
5789</dt>
5790<dd>
5791<p>
5792 Any URL that starts with this value will not be pushed to;
5793 instead, it will be rewritten to start with &lt;base&gt;, and the
5794 resulting URL will be pushed to. In cases where some site serves
5795 a large number of repositories, and serves them with multiple
5796 access methods, some of which do not allow push, this feature
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]5797 allows people to specify a pull-only URL and have Git
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]5798 automatically use an appropriate URL to push, even for a
5799 never-before-seen repository on the site. When more than one
5800 pushInsteadOf strings match a given URL, the longest match is
Junio C Hamano076ffcc2013-02-06 05:13:21[diff] [blame]5801 used. If a remote has an explicit pushurl, Git will ignore this
Junio C Hamano7df6dcf2009-09-13 09:51:17[diff] [blame]5802 setting for that remote.
5803</p>
5804</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5805<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5806user.email
5807</dt>
5808<dd>
5809<p>
5810 Your email address to be recorded in any newly created commits.
Junio C Hamano469d60e2007-04-29 18:30:34[diff] [blame]5811 Can be overridden by the <em>GIT_AUTHOR_EMAIL</em>, <em>GIT_COMMITTER_EMAIL</em>, and
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5812 <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]5813</p>
5814</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5815<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5816user.name
5817</dt>
5818<dd>
5819<p>
5820 Your full name to be recorded in any newly created commits.
5821 Can be overridden by the <em>GIT_AUTHOR_NAME</em> and <em>GIT_COMMITTER_NAME</em>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5822 environment variables. See <a href="git-commit-tree.html">git-commit-tree(1)</a>.
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5823</p>
5824</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5825<dt class="hdlist1">
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5826user.signingkey
5827</dt>
5828<dd>
5829<p>
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5830 If <a href="git-tag.html">git-tag(1)</a> is not selecting the key you want it to
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5831 automatically when creating a signed tag, you can override the
5832 default selection with this variable. This option is passed
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5833 unchanged to gpg&#8217;s --local-user parameter, so you may specify a key
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5834 using any method that gpg supports.
5835</p>
5836</dd>
Junio C Hamano68cf15a2010-11-06 01:01:59[diff] [blame]5837<dt class="hdlist1">
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]5838web.browser
5839</dt>
5840<dd>
5841<p>
5842 Specify a web browser that may be used by some commands.
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5843 Currently only <a href="git-instaweb.html">git-instaweb(1)</a> and <a href="git-help.html">git-help(1)</a>
Junio C Hamano4e272312008-01-08 09:13:21[diff] [blame]5844 may use it.
5845</p>
5846</dd>
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]5847</dl></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5848</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5849</div>
5850</div>
5851<div class="sect1">
Junio C Hamanoba4b9282008-07-06 05:20:31[diff] [blame]5852<h2 id="_git">GIT</h2>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5853<div class="sectionbody">
Junio C Hamanoa28a9202012-06-21 07:08:23[diff] [blame]5854<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]5855</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]5856</div>
Junio C Hamano9d971152012-12-19 00:43:11[diff] [blame]5857</div>
Junio C Hamano7bd050f2011-09-22 06:32:22[diff] [blame]5858<div id="footnotes"><hr /></div>
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5859<div id="footer">
5860<div id="footer-text">
Junio C Hamano8401f142013-07-12 22:47:46[diff] [blame^]5861Last updated 2013-07-12 15:46:35 PDT
Junio C Hamano7ad22dc2007-01-29 02:55:48[diff] [blame]5862</div>
5863</div>
5864</body>
5865</html>