blob: c95eef17ef6f03176228d270cd028b6a46403458 [file] [log] [blame]
Junio C Hamano1a4e8412005-12-27 08:17:231<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
2 "http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
3<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en">
4<head>
5<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
Junio C Hamano63636e52006-02-12 13:31:396<meta name="generator" content="AsciiDoc 7.0.2" />
Junio C Hamano1a4e8412005-12-27 08:17:237<style type="text/css">
8/* Debug borders */
9p, li, dt, dd, div, pre, h1, h2, h3, h4, h5, h6 {
10/*
11 border: 1px solid red;
12*/
13}
14
15body {
16 margin: 1em 5% 1em 5%;
17}
18
19a { color: blue; }
20a:visited { color: fuchsia; }
21
22em {
23 font-style: italic;
24}
25
26strong {
27 font-weight: bold;
28}
29
30tt {
31 color: navy;
32}
33
34h1, h2, h3, h4, h5, h6 {
35 color: #527bbd;
36 font-family: sans-serif;
37 margin-top: 1.2em;
38 margin-bottom: 0.5em;
39 line-height: 1.3;
40}
41
42h1 {
43 border-bottom: 2px solid silver;
44}
45h2 {
46 border-bottom: 2px solid silver;
47 padding-top: 0.5em;
48}
49
50div.sectionbody {
51 font-family: serif;
52 margin-left: 0;
53}
54
55hr {
56 border: 1px solid silver;
57}
58
59p {
60 margin-top: 0.5em;
61 margin-bottom: 0.5em;
62}
63
64pre {
65 padding: 0;
66 margin: 0;
67}
68
69span#author {
70 color: #527bbd;
71 font-family: sans-serif;
72 font-weight: bold;
73 font-size: 1.2em;
74}
75span#email {
76}
77span#revision {
78 font-family: sans-serif;
79}
80
81div#footer {
82 font-family: sans-serif;
83 font-size: small;
84 border-top: 2px solid silver;
85 padding-top: 0.5em;
86 margin-top: 4.0em;
87}
88div#footer-text {
89 float: left;
90 padding-bottom: 0.5em;
91}
92div#footer-badges {
93 float: right;
94 padding-bottom: 0.5em;
95}
96
97div#preamble,
98div.tableblock, div.imageblock, div.exampleblock, div.verseblock,
99div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
100div.admonitionblock {
101 margin-right: 10%;
102 margin-top: 1.5em;
103 margin-bottom: 1.5em;
104}
105div.admonitionblock {
106 margin-top: 2.5em;
107 margin-bottom: 2.5em;
108}
109
110div.content { /* Block element content. */
111 padding: 0;
112}
113
114/* Block element titles. */
115div.title, caption.title {
116 font-family: sans-serif;
117 font-weight: bold;
118 text-align: left;
119 margin-top: 1.0em;
120 margin-bottom: 0.5em;
121}
122div.title + * {
123 margin-top: 0;
124}
125
126td div.title:first-child {
127 margin-top: 0.0em;
128}
129div.content div.title:first-child {
130 margin-top: 0.0em;
131}
132div.content + div.title {
133 margin-top: 0.0em;
134}
135
136div.sidebarblock > div.content {
137 background: #ffffee;
138 border: 1px solid silver;
139 padding: 0.5em;
140}
141
142div.listingblock > div.content {
143 border: 1px solid silver;
144 background: #f4f4f4;
145 padding: 0.5em;
146}
147
148div.quoteblock > div.content {
149 padding-left: 2.0em;
150}
151div.quoteblock .attribution {
152 text-align: right;
153}
154
155div.admonitionblock .icon {
156 vertical-align: top;
157 font-size: 1.1em;
158 font-weight: bold;
159 text-decoration: underline;
160 color: #527bbd;
161 padding-right: 0.5em;
162}
163div.admonitionblock td.content {
164 padding-left: 0.5em;
165 border-left: 2px solid silver;
166}
167
168div.exampleblock > div.content {
169 border-left: 2px solid silver;
170 padding: 0.5em;
171}
172
173div.verseblock div.content {
174 white-space: pre;
175}
176
177div.imageblock div.content { padding-left: 0; }
178div.imageblock img { border: 1px solid silver; }
179span.image img { border-style: none; }
180
181dl {
182 margin-top: 0.8em;
183 margin-bottom: 0.8em;
184}
185dt {
186 margin-top: 0.5em;
187 margin-bottom: 0;
188 font-style: italic;
189}
190dd > *:first-child {
191 margin-top: 0;
192}
193
194ul, ol {
195 list-style-position: outside;
196}
197ol.olist2 {
198 list-style-type: lower-alpha;
199}
200
201div.tableblock > table {
202 border-color: #527bbd;
203 border-width: 3px;
204}
205thead {
206 font-family: sans-serif;
207 font-weight: bold;
208}
209tfoot {
210 font-weight: bold;
211}
212
213div.hlist {
214 margin-top: 0.8em;
215 margin-bottom: 0.8em;
216}
217td.hlist1 {
218 vertical-align: top;
219 font-style: italic;
220 padding-right: 0.8em;
221}
222td.hlist2 {
223 vertical-align: top;
224}
225
226@media print {
227 div#footer-badges { display: none; }
228}
229include::./stylesheets/xhtml11-manpage.css[]
230/* Workarounds for IE6's broken and incomplete CSS2. */
231
232div.sidebar-content {
233 background: #ffffee;
234 border: 1px solid silver;
235 padding: 0.5em;
236}
237div.sidebar-title, div.image-title {
238 font-family: sans-serif;
239 font-weight: bold;
240 margin-top: 0.0em;
241 margin-bottom: 0.5em;
242}
243
244div.listingblock div.content {
245 border: 1px solid silver;
246 background: #f4f4f4;
247 padding: 0.5em;
248}
249
250div.quoteblock-content {
251 padding-left: 2.0em;
252}
253
254div.exampleblock-content {
255 border-left: 2px solid silver;
256 padding-left: 0.5em;
257}
258</style>
259<title>git-repo-config(1)</title>
260</head>
261<body>
262<div id="header">
263<h1>
264git-repo-config(1) Manual Page
265</h1>
266<h2>NAME</h2>
267<div class="sectionbody">
268<p>git-repo-config -
Junio C Hamano01078922006-03-10 00:31:47269 Get and set options in .git/config
Junio C Hamano1a4e8412005-12-27 08:17:23270</p>
271</div>
272</div>
273<h2>SYNOPSIS</h2>
274<div class="sectionbody">
Junio C Hamano9c099c82006-03-03 23:19:48275<div class="verseblock">
276<div class="content"><em>git-repo-config</em> [type] name [value [value_regex]]
Junio C Hamano63636e52006-02-12 13:31:39277<em>git-repo-config</em> [type] --replace-all name [value [value_regex]]
278<em>git-repo-config</em> [type] --get name [value_regex]
279<em>git-repo-config</em> [type] --get-all name [value_regex]
280<em>git-repo-config</em> [type] --unset name [value_regex]
Junio C Hamano6de0ecd2006-04-27 20:10:43281<em>git-repo-config</em> [type] --unset-all name [value_regex]
282<em>git-repo-config</em> -l | --list</div></div>
Junio C Hamano1a4e8412005-12-27 08:17:23283</div>
284<h2>DESCRIPTION</h2>
285<div class="sectionbody">
286<p>You can query/set/replace/unset options with this command. The name is
287actually the section and the key separated by a dot, and the value will be
288escaped.</p>
Junio C Hamano6d891e62006-05-07 23:36:21289<p>If you want to set/unset an option which can occur on multiple
290lines, a POSIX regexp <tt>value_regex</tt> needs to be given. Only the
291existing values that match the regexp are updated or unset. If
292you want to handle the lines that do <strong>not</strong> match the regex, just
293prepend a single exclamation mark in front (see EXAMPLES).</p>
Junio C Hamano63636e52006-02-12 13:31:39294<p>The type specifier can be either <em>--int</em> or <em>--bool</em>, which will make
295<em>git-repo-config</em> ensure that the variable(s) are of the given type and
296convert the value to the canonical form (simple decimal number for int,
297a "true" or "false" string for bool). If no type specifier is passed,
298no checks or transformations are performed on the value.</p>
Junio C Hamano1bb569e2006-05-05 23:14:25299<p>This command will fail if:</p>
Junio C Hamano1a4e8412005-12-27 08:17:23300<ol>
301<li>
302<p>
Junio C Hamano1bb569e2006-05-05 23:14:25303The .git/config file is invalid,
Junio C Hamano1a4e8412005-12-27 08:17:23304</p>
305</li>
306<li>
307<p>
Junio C Hamano1bb569e2006-05-05 23:14:25308Can not write to .git/config,
Junio C Hamano1a4e8412005-12-27 08:17:23309</p>
310</li>
311<li>
312<p>
313no section was provided,
314</p>
315</li>
316<li>
317<p>
318the section or key is invalid,
319</p>
320</li>
321<li>
322<p>
323you try to unset an option which does not exist, or
324</p>
325</li>
326<li>
327<p>
328you try to unset/set an option for which multiple lines match.
329</p>
330</li>
331</ol>
332</div>
333<h2>OPTIONS</h2>
334<div class="sectionbody">
335<dl>
336<dt>
337--replace-all
338</dt>
339<dd>
340<p>
Junio C Hamano341071d2006-06-04 07:24:48341 Default behavior is to replace at most one line. This replaces
Junio C Hamano88a3a072006-05-04 08:01:43342 all lines matching the key (and optionally the value_regex).
Junio C Hamano1a4e8412005-12-27 08:17:23343</p>
344</dd>
345<dt>
346--get
347</dt>
348<dd>
349<p>
350 Get the value for a given key (optionally filtered by a regex
351 matching the value).
352</p>
353</dd>
354<dt>
355--get-all
356</dt>
357<dd>
358<p>
359 Like get, but does not fail if the number of values for the key
360 is not exactly one.
361</p>
362</dd>
363<dt>
Junio C Hamano88a3a072006-05-04 08:01:43364--get-regexp
365</dt>
366<dd>
367<p>
368 Like --get-all, but interprets the name as a regular expression.
369</p>
370</dd>
371<dt>
Junio C Hamano1a4e8412005-12-27 08:17:23372--unset
373</dt>
374<dd>
375<p>
376 Remove the line matching the key from .git/config.
377</p>
378</dd>
379<dt>
380--unset-all
381</dt>
382<dd>
383<p>
384 Remove all matching lines from .git/config.
385</p>
386</dd>
Junio C Hamano6de0ecd2006-04-27 20:10:43387<dt>
388-l, --list
389</dt>
390<dd>
391<p>
392 List all variables set in .git/config.
393</p>
394</dd>
Junio C Hamano1a4e8412005-12-27 08:17:23395</dl>
396</div>
397<h2>EXAMPLE</h2>
398<div class="sectionbody">
399<p>Given a .git/config like this:</p>
400<div class="literalblock">
401<div class="content">
402<pre><tt>#
403# This is the config file, and
404# a '#' or ';' character indicates
405# a comment
406#</tt></pre>
407</div></div>
408<div class="literalblock">
409<div class="content">
410<pre><tt>; core variables
411[core]
412 ; Don't trust file modes
413 filemode = false</tt></pre>
414</div></div>
415<div class="literalblock">
416<div class="content">
417<pre><tt>; Our diff algorithm
418[diff]
419 external = "/usr/local/bin/gnu-diff -u"
420 renames = true</tt></pre>
421</div></div>
422<div class="literalblock">
423<div class="content">
424<pre><tt>; Proxy settings
Junio C Hamano07824ce2006-04-25 07:36:54425[core]
426 gitproxy="ssh" for "ssh://kernel.org/"
427 gitproxy="proxy-command" for kernel.org
428 gitproxy="myprotocol-command" for "my://"
429 gitproxy=default-proxy ; for all the rest</tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23430</div></div>
431<p>you can set the filemode to true with</p>
432<div class="listingblock">
433<div class="content">
434<pre><tt>% git repo-config core.filemode true</tt></pre>
435</div></div>
436<p>The hypothetic proxy command entries actually have a postfix to discern
437to what URL they apply. Here is how to change the entry for kernel.org
438to "ssh".</p>
439<div class="listingblock">
440<div class="content">
Junio C Hamano07824ce2006-04-25 07:36:54441<pre><tt>% git repo-config core.gitproxy '"ssh" for kernel.org' 'for kernel.org$'</tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23442</div></div>
443<p>This makes sure that only the key/value pair for kernel.org is replaced.</p>
444<p>To delete the entry for renames, do</p>
445<div class="listingblock">
446<div class="content">
447<pre><tt>% git repo-config --unset diff.renames</tt></pre>
448</div></div>
Junio C Hamano07824ce2006-04-25 07:36:54449<p>If you want to delete an entry for a multivar (like core.gitproxy above),
Junio C Hamano1a4e8412005-12-27 08:17:23450you have to provide a regex matching the value of exactly one line.</p>
451<p>To query the value for a given key, do</p>
452<div class="listingblock">
453<div class="content">
454<pre><tt>% git repo-config --get core.filemode</tt></pre>
455</div></div>
456<p>or</p>
457<div class="listingblock">
458<div class="content">
459<pre><tt>% git repo-config core.filemode</tt></pre>
460</div></div>
461<p>or, to query a multivar:</p>
462<div class="listingblock">
463<div class="content">
Junio C Hamano07824ce2006-04-25 07:36:54464<pre><tt>% git repo-config --get core.gitproxy "for kernel.org$"</tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23465</div></div>
466<p>If you want to know all the values for a multivar, do:</p>
467<div class="listingblock">
468<div class="content">
Junio C Hamano07824ce2006-04-25 07:36:54469<pre><tt>% git repo-config --get-all core.gitproxy</tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23470</div></div>
Junio C Hamano07824ce2006-04-25 07:36:54471<p>If you like to live dangerous, you can replace <strong>all</strong> core.gitproxy by a
Junio C Hamano1a4e8412005-12-27 08:17:23472new one with</p>
473<div class="listingblock">
474<div class="content">
Junio C Hamano07824ce2006-04-25 07:36:54475<pre><tt>% git repo-config --replace-all core.gitproxy ssh</tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23476</div></div>
477<p>However, if you really only want to replace the line for the default proxy,
478i.e. the one without a "for &#8230;" postfix, do something like this:</p>
479<div class="listingblock">
480<div class="content">
Junio C Hamano07824ce2006-04-25 07:36:54481<pre><tt>% git repo-config core.gitproxy ssh '! for '</tt></pre>
Junio C Hamano1a4e8412005-12-27 08:17:23482</div></div>
483<p>To actually match only values with an exclamation mark, you have to</p>
484<div class="listingblock">
485<div class="content">
486<pre><tt>% git repo-config section.key value '[!]'</tt></pre>
487</div></div>
488</div>
Junio C Hamano07824ce2006-04-25 07:36:54489<h2>CONFIGURATION FILE</h2>
490<div class="sectionbody">
491<p>The git configuration file contains a number of variables that affect
Junio C Hamano341071d2006-06-04 07:24:48492the git commands behavior. They can be used by both the git plumbing
Junio C Hamano07824ce2006-04-25 07:36:54493and the porcelains. The variables are divided to sections, where
494in the fully qualified variable name the variable itself is the last
495dot-separated segment and the section name is everything before the last
496dot. The variable names are case-insensitive and only alphanumeric
497characters are allowed. Some variables may appear multiple times.</p>
498<p>The syntax is fairly flexible and permissive; whitespaces are mostly
499ignored. The <em>#</em> and <em>;</em> characters begin commends to the end of line,
500blank lines are ignored, lines containing strings enclosed in square
501brackets start sections and all the other lines are recognized
502as setting variables, in the form <em>name = value</em>. If there is no equal
503sign on the line, the entire line is taken as <em>name</em> and the variable
504is recognized as boolean "true". String values may be entirely or partially
505enclosed in double quotes; some variables may require special value format.</p>
506<h3>Example</h3>
507<div class="literalblock">
508<div class="content">
509<pre><tt># Core variables
510[core]
511 ; Don't trust file modes
512 filemode = false</tt></pre>
513</div></div>
514<div class="literalblock">
515<div class="content">
516<pre><tt># Our diff algorithm
517[diff]
518 external = "/usr/local/bin/gnu-diff -u"
519 renames = true</tt></pre>
520</div></div>
521<h3>Variables</h3>
522<p>Note that this list is non-comprehensive and not necessarily complete.
523For command-specific variables, you will find more detailed description
524in the appropriate manual page. You will find description of non-core
525porcelain configuration variables in the respective porcelain documentation.</p>
526<dl>
527<dt>
528core.fileMode
529</dt>
530<dd>
531<p>
532 If false, the executable bit differences between the index and
533 the working copy are ignored; useful on broken filesystems like FAT.
534 See <a href="git-update-index.html">git-update-index(1)</a>. True by default.
535</p>
536</dd>
537<dt>
538core.gitProxy
539</dt>
540<dd>
541<p>
542 A "proxy command" to execute (as <em>command host port</em>) instead
543 of establishing direct connection to the remote server when
544 using the git protocol for fetching. If the variable value is
545 in the "COMMAND for DOMAIN" format, the command is applied only
546 on hostnames ending with the specified domain string. This variable
547 may be set multiple times and is matched in the given order;
548 the first match wins.
549</p>
550<div class="literalblock">
551<div class="content">
Junio C Hamano341071d2006-06-04 07:24:48552<pre><tt>Can be overridden by the 'GIT_PROXY_COMMAND' environment variable
Junio C Hamano07824ce2006-04-25 07:36:54553(which always applies universally, without the special "for"
554handling).</tt></pre>
555</div></div>
556</dd>
557<dt>
558core.ignoreStat
559</dt>
560<dd>
561<p>
562 The working copy files are assumed to stay unchanged until you
563 mark them otherwise manually - Git will not detect the file changes
564 by lstat() calls. This is useful on systems where those are very
565 slow, such as Microsoft Windows. See <a href="git-update-index.html">git-update-index(1)</a>.
566 False by default.
567</p>
568</dd>
569<dt>
Junio C Hamano88a3a072006-05-04 08:01:43570core.preferSymlinkRefs
Junio C Hamano07824ce2006-04-25 07:36:54571</dt>
572<dd>
573<p>
Junio C Hamano88a3a072006-05-04 08:01:43574 Instead of the default "symref" format for HEAD
575 and other symbolic reference files, use symbolic links.
576 This is sometimes needed to work with old scripts that
577 expect HEAD to be a symbolic link.
Junio C Hamano07824ce2006-04-25 07:36:54578</p>
579</dd>
580<dt>
Junio C Hamano341071d2006-06-04 07:24:48581core.logAllRefUpdates
582</dt>
583<dd>
584<p>
585 If true, <tt>git-update-ref</tt> will append a line to
586 "$GIT_DIR/logs/&lt;ref&gt;" listing the new SHA1 and the date/time
587 of the update. If the file does not exist it will be
588 created automatically. This information can be used to
589 determine what commit was the tip of a branch "2 days ago".
590 This value is false by default (no logging).
591</p>
592</dd>
593<dt>
Junio C Hamano07824ce2006-04-25 07:36:54594core.repositoryFormatVersion
595</dt>
596<dd>
597<p>
598 Internal variable identifying the repository format and layout
599 version.
600</p>
601</dd>
602<dt>
603core.sharedRepository
604</dt>
605<dd>
606<p>
607 If true, the repository is made shareable between several users
608 in a group (making sure all the files and objects are group-writable).
609 See <a href="git-init-db.html">git-init-db(1)</a>. False by default.
610</p>
611</dd>
612<dt>
613core.warnAmbiguousRefs
614</dt>
615<dd>
616<p>
617 If true, git will warn you if the ref name you passed it is ambiguous
618 and might match multiple refs in the .git/refs/ tree. True by default.
619</p>
620</dd>
621<dt>
622apply.whitespace
623</dt>
624<dd>
625<p>
626 Tells <tt>git-apply</tt> how to handle whitespaces, in the same way
627 as the <em>--whitespace</em> option. See <a href="git-apply.html">git-apply(1)</a>.
628</p>
629</dd>
630<dt>
631diff.renameLimit
632</dt>
633<dd>
634<p>
635 The number of files to consider when performing the copy/rename
636 detection; equivalent to the git diff option <em>-l</em>.
637</p>
638</dd>
639<dt>
640format.headers
641</dt>
642<dd>
643<p>
644 Additional email headers to include in a patch to be submitted
645 by mail. See <a href="git-format-patch.html">git-format-patch(1)</a>.
646</p>
647</dd>
648<dt>
649gitcvs.enabled
650</dt>
651<dd>
652<p>
653 Whether the cvs pserver interface is enabled for this repository.
654 See <a href="git-cvsserver.html">git-cvsserver(1)</a>.
655</p>
656</dd>
657<dt>
658gitcvs.logfile
659</dt>
660<dd>
661<p>
662 Path to a log file where the cvs pserver interface well&#8230; logs
663 various stuff. See <a href="git-cvsserver.html">git-cvsserver(1)</a>.
664</p>
665</dd>
666<dt>
667http.sslVerify
668</dt>
669<dd>
670<p>
671 Whether to verify the SSL certificate when fetching or pushing
672 over HTTPS. Can be overriden by the <em>GIT_SSL_NO_VERIFY</em> environment
673 variable.
674</p>
675</dd>
676<dt>
677http.sslCert
678</dt>
679<dd>
680<p>
681 File containing the SSL certificate when fetching or pushing
682 over HTTPS. Can be overriden by the <em>GIT_SSL_CERT</em> environment
683 variable.
684</p>
685</dd>
686<dt>
687http.sslKey
688</dt>
689<dd>
690<p>
691 File containing the SSL private key when fetching or pushing
Junio C Hamano341071d2006-06-04 07:24:48692 over HTTPS. Can be overridden by the <em>GIT_SSL_KEY</em> environment
Junio C Hamano07824ce2006-04-25 07:36:54693 variable.
694</p>
695</dd>
696<dt>
697http.sslCAInfo
698</dt>
699<dd>
700<p>
701 File containing the certificates to verify the peer with when
Junio C Hamano341071d2006-06-04 07:24:48702 fetching or pushing over HTTPS. Can be overridden by the
Junio C Hamano07824ce2006-04-25 07:36:54703 <em>GIT_SSL_CAINFO</em> environment variable.
704</p>
705</dd>
706<dt>
707http.sslCAPath
708</dt>
709<dd>
710<p>
711 Path containing files with the CA certificates to verify the peer
712 with when fetching or pushing over HTTPS. Can be overriden
713 by the <em>GIT_SSL_CAPATH</em> environment variable.
714</p>
715</dd>
716<dt>
717http.maxRequests
718</dt>
719<dd>
720<p>
Junio C Hamano341071d2006-06-04 07:24:48721 How many HTTP requests to launch in parallel. Can be overridden
Junio C Hamano07824ce2006-04-25 07:36:54722 by the <em>GIT_HTTP_MAX_REQUESTS</em> environment variable. Default is 5.
723</p>
724</dd>
725<dt>
726http.lowSpeedLimit, http.lowSpeedTime
727</dt>
728<dd>
729<p>
730 If the HTTP transfer speed is less than <em>http.lowSpeedLimit</em>
731 for longer than <em>http.lowSpeedTime</em> seconds, the transfer is aborted.
Junio C Hamano341071d2006-06-04 07:24:48732 Can be overridden by the <em>GIT_HTTP_LOW_SPEED_LIMIT</em> and
Junio C Hamano07824ce2006-04-25 07:36:54733 <em>GIT_HTTP_LOW_SPEED_TIME</em> environment variables.
734</p>
735</dd>
736<dt>
737i18n.commitEncoding
738</dt>
739<dd>
740<p>
741 Character encoding the commit messages are stored in; git itself
742 does not care per se, but this information is necessary e.g. when
743 importing commits from emails or in the gitk graphical history
744 browser (and possibly at other places in the future or in other
745 porcelains). See e.g. <a href="git-mailinfo.html">git-mailinfo(1)</a>. Defaults to <em>utf-8</em>.
746</p>
747</dd>
748<dt>
749merge.summary
750</dt>
751<dd>
752<p>
753 Whether to include summaries of merged commits in newly created
754 merge commit messages. False by default.
755</p>
756</dd>
757<dt>
758pull.octopus
759</dt>
760<dd>
761<p>
762 The default merge strategy to use when pulling multiple branches
763 at once.
764</p>
765</dd>
766<dt>
767pull.twohead
768</dt>
769<dd>
770<p>
771 The default merge strategy to use when pulling a single branch.
772</p>
773</dd>
774<dt>
775show.difftree
776</dt>
777<dd>
778<p>
779 The default <a href="git-diff-tree.html">git-diff-tree(1)</a> arguments to be used
780 for <a href="git-show.html">git-show(1)</a>.
781</p>
782</dd>
783<dt>
784showbranch.default
785</dt>
786<dd>
787<p>
788 The default set of branches for <a href="git-show-branch.html">git-show-branch(1)</a>.
789 See <a href="git-show-branch.html">git-show-branch(1)</a>.
790</p>
791</dd>
792<dt>
793user.email
794</dt>
795<dd>
796<p>
797 Your email address to be recorded in any newly created commits.
Junio C Hamano341071d2006-06-04 07:24:48798 Can be overridden by the <em>GIT_AUTHOR_EMAIL</em> and <em>GIT_COMMITTER_EMAIL</em>
Junio C Hamano07824ce2006-04-25 07:36:54799 environment variables. See <a href="git-commit-tree.html">git-commit-tree(1)</a>.
800</p>
801</dd>
802<dt>
803user.name
804</dt>
805<dd>
806<p>
807 Your full name to be recorded in any newly created commits.
Junio C Hamano341071d2006-06-04 07:24:48808 Can be overridden by the <em>GIT_AUTHOR_NAME</em> and <em>GIT_COMMITTER_NAME</em>
Junio C Hamano07824ce2006-04-25 07:36:54809 environment variables. See <a href="git-commit-tree.html">git-commit-tree(1)</a>.
810</p>
811</dd>
812<dt>
813whatchanged.difftree
814</dt>
815<dd>
816<p>
817 The default <a href="git-diff-tree.html">git-diff-tree(1)</a> arguments to be used
818 for <a href="git-whatchanged.html">git-whatchanged(1)</a>.
819</p>
820</dd>
821<dt>
822imap
823</dt>
824<dd>
825<p>
826 The configuration variables in the <em>imap</em> section are described
827 in <a href="git-imap-send.html">git-imap-send(1)</a>.
828</p>
829</dd>
830</dl>
831</div>
Junio C Hamano1a4e8412005-12-27 08:17:23832<h2>Author</h2>
833<div class="sectionbody">
834<p>Written by Johannes Schindelin &lt;Johannes.Schindelin@gmx.de&gt;</p>
835</div>
836<h2>Documentation</h2>
837<div class="sectionbody">
Junio C Hamano07824ce2006-04-25 07:36:54838<p>Documentation by Johannes Schindelin, Petr Baudis and the git-list &lt;git@vger.kernel.org&gt;.</p>
Junio C Hamano1a4e8412005-12-27 08:17:23839</div>
840<h2>GIT</h2>
841<div class="sectionbody">
842<p>Part of the <a href="git.html">git(7)</a> suite</p>
843</div>
844<div id="footer">
845<div id="footer-text">
Junio C Hamano341071d2006-06-04 07:24:48846Last updated 04-Jun-2006 07:24:29 UTC
Junio C Hamano1a4e8412005-12-27 08:17:23847</div>
848</div>
849</body>
850</html>