Merge branch 'mt/doc-worktree-ref'

[thirdparty/git.git] / Documentation / config.txt

diff --git a/Documentation/config.txt b/Documentation/config.txt
index 68e2d62e397476182a23ca3b9ed68071134c4a55..ef0768b91a02cafdcb6044dba0169a5092bbd913 100644 (file)
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -221,12 +221,12 @@ Example
 ; affected by the condition
 [includeIf "gitdir:/path/to/group/"]
        path = foo.inc
-----
 
-       ; include only if we are in a worktree where foo-branch is
-       ; currently checked out
-       [includeIf "onbranch:foo-branch"]
-               path = foo.inc
+; include only if we are in a worktree where foo-branch is
+; currently checked out
+[includeIf "onbranch:foo-branch"]
+       path = foo.inc
+----
 
 Values
 ~~~~~~
@@ -448,6 +448,8 @@ include::config/submodule.txt[]
 
 include::config/tag.txt[]
 
+include::config/tar.txt[]
+
 include::config/trace2.txt[]
 
 include::config/transfer.txt[]