summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorLibravatar Junio C Hamano <gitster@pobox.com>2016-05-26 13:17:26 -0700
committerLibravatar Junio C Hamano <gitster@pobox.com>2016-05-26 13:17:26 -0700
commit6396212d1ccf26d98eaea6a4643ff9d9d2a14cda (patch)
tree6ea987d67f91b96db0374506b4ea157df9e09254 /Documentation/config.txt
parentMerge branch 'ls/travis-build-doc' into maint (diff)
parentDocumentation: fix linkgit references (diff)
downloadtgif-6396212d1ccf26d98eaea6a4643ff9d9d2a14cda.tar.xz
Merge branch 'jc/linkgit-fix' into maint
Many 'linkgit:<git documentation page>' references were broken, which are all fixed with this. * jc/linkgit-fix: Documentation: fix linkgit references
Diffstat (limited to 'Documentation/config.txt')
-rw-r--r--Documentation/config.txt4
1 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/config.txt b/Documentation/config.txt
index ce4651be94..d3a6de81d3 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1507,7 +1507,7 @@ gui.diffContext::
made by the linkgit:git-gui[1]. The default is "5".
gui.displayUntracked::
- Determines if linkgit::git-gui[1] shows untracked files
+ Determines if linkgit:git-gui[1] shows untracked files
in the file list. The default is "true".
gui.encoding::
@@ -1672,7 +1672,7 @@ http.cookieFile::
File containing previously stored cookie lines which should be used
in the Git http session, if they match the server. The file format
of the file to read cookies from should be plain HTTP headers or
- the Netscape/Mozilla cookie file format (see linkgit:curl[1]).
+ the Netscape/Mozilla cookie file format (see `curl(1)`).
NOTE that the file specified with http.cookieFile is only used as
input unless http.saveCookies is set.