summaryrefslogtreecommitdiff
path: root/Documentation/config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2016-05-17 14:38:31 -0700
committerJunio C Hamano <gitster@pobox.com>2016-05-17 14:38:31 -0700
commit5f232ecfdf2982adf67af5f9b7aaf05da13a155c (patch)
tree5bb068e85b86af7b955944fc3be14c956000569b /Documentation/config.txt
parentb7f61426675722b9841a534b8a850ca7fab5aa56 (diff)
parent1cca17dfff488760e74e2af4b0f686b20a02e6e1 (diff)
downloadgit-5f232ecfdf2982adf67af5f9b7aaf05da13a155c.tar.gz
Merge branch 'jc/linkgit-fix'
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 e718410350..3127aed1d8 100644
--- a/Documentation/config.txt
+++ b/Documentation/config.txt
@@ -1519,7 +1519,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::
@@ -1691,7 +1691,7 @@ http.cookieFile::
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 used only as
input unless http.saveCookies is set.