summaryrefslogtreecommitdiffstats
path: root/git-config.html
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2019-10-09 14:55:30 +0900
committerJunio C Hamano <gitster@pobox.com>2019-10-09 14:55:30 +0900
commit48cd3f1251acf31e83d2e59ddf2176aa8e84290c (patch)
tree56769f5f3a65e8ce06b8eaa6f1b8bb795c8c6434 /git-config.html
parenta8858316fb3186e69d324183d9af58ef55dfb794 (diff)
downloadgit-htmldocs-48cd3f1251acf31e83d2e59ddf2176aa8e84290c.tar.gz
Autogenerated HTML docs for v2.23.0-526-g70bf0
Diffstat (limited to 'git-config.html')
-rw-r--r--git-config.html102
1 files changed, 39 insertions, 63 deletions
diff --git a/git-config.html b/git-config.html
index c8a582c51..09989a803 100644
--- a/git-config.html
+++ b/git-config.html
@@ -1314,38 +1314,30 @@ GIT_CONFIG_NOSYSTEM
<h2 id="EXAMPLES">EXAMPLES</h2>
<div class="sectionbody">
<div class="paragraph"><p>Given a .git/config like this:</p></div>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
<pre><code>#
# This is the config file, and
# a '#' or ';' character indicates
# a comment
-#</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>; core variables
+#
+
+; core variables
[core]
; Don't trust file modes
- filemode = false</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>; Our diff algorithm
+ filemode = false
+
+; Our diff algorithm
[diff]
external = /usr/local/bin/diff-wrapper
- renames = true</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>; Proxy settings
+ renames = true
+
+; Proxy settings
[core]
gitproxy=proxy-command for kernel.org
- gitproxy=default-proxy ; for all the rest</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>; HTTP
+ gitproxy=default-proxy ; for all the rest
+
+; HTTP
[http]
sslVerify
[http "https://weak.example.com"]
@@ -1634,61 +1626,45 @@ Note that "../" is not special and will match literally, which is
</div>
<div class="sect2">
<h3 id="_example">Example</h3>
-<div class="literalblock">
+<div class="listingblock">
<div class="content">
<pre><code># Core variables
[core]
; Don't trust file modes
- filemode = false</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code># Our diff algorithm
+ filemode = false
+
+# Our diff algorithm
[diff]
external = /usr/local/bin/diff-wrapper
- renames = true</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>[branch "devel"]
+ renames = true
+
+[branch "devel"]
remote = origin
- merge = refs/heads/devel</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code># Proxy settings
+ merge = refs/heads/devel
+
+# Proxy settings
[core]
gitProxy="ssh" for "kernel.org"
- gitProxy=default-proxy ; for the rest</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>[include]
+ gitProxy=default-proxy ; for the rest
+
+[include]
path = /path/to/foo.inc ; include by absolute path
path = foo.inc ; find "foo.inc" relative to the current file
- path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>; include if $GIT_DIR is /path/to/foo/.git
+ path = ~/foo.inc ; find "foo.inc" in your `$HOME` directory
+
+; include if $GIT_DIR is /path/to/foo/.git
[includeIf "gitdir:/path/to/foo/.git"]
- path = /path/to/foo.inc</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>; include for all repositories inside /path/to/group
+ path = /path/to/foo.inc
+
+; include for all repositories inside /path/to/group
[includeIf "gitdir:/path/to/group/"]
- path = /path/to/foo.inc</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>; include for all repositories inside $HOME/to/group
+ path = /path/to/foo.inc
+
+; include for all repositories inside $HOME/to/group
[includeIf "gitdir:~/to/group/"]
- path = /path/to/foo.inc</code></pre>
-</div></div>
-<div class="literalblock">
-<div class="content">
-<pre><code>; relative paths are always relative to the including
+ path = /path/to/foo.inc
+
+; relative paths are always relative to the including
; file (if the condition is true); their location is not
; affected by the condition
[includeIf "gitdir:/path/to/group/"]
@@ -9486,7 +9462,7 @@ looks like</p></div>
<div id="footer">
<div id="footer-text">
Last updated
- 2019-04-16 21:48:13 JST
+ 2019-10-09 14:51:03 JST
</div>
</div>
</body>