summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2020-04-22 20:42:54 (GMT)
committerJunio C Hamano <gitster@pobox.com>2020-04-22 20:42:55 (GMT)
commitbc20556505e4c337d34d1e5272c9bdc274dd081a (patch)
tree3e0ffaacd0aae10f27ddb402361dae76172a8e6c /Documentation
parentf4216e5968778a8710e5fc0f4dc7ecdcc53b6448 (diff)
parent76ba7fa225deea3fb5cd4d9cedeca819210883fc (diff)
downloadgit-bc20556505e4c337d34d1e5272c9bdc274dd081a.zip
git-bc20556505e4c337d34d1e5272c9bdc274dd081a.tar.gz
git-bc20556505e4c337d34d1e5272c9bdc274dd081a.tar.bz2
Merge branch 'ma/config-doc-fix'
Doc update. * ma/config-doc-fix: config.txt: move closing "----" to cover entire listing
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/config.txt10
1 files changed, 5 insertions, 5 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index 2450589..74009d5 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -220,12 +220,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
~~~~~~