summaryrefslogtreecommitdiff
path: root/Documentation
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2017-03-24 13:07:34 -0700
committerJunio C Hamano <gitster@pobox.com>2017-03-24 13:07:34 -0700
commit78cf8efec34c419ecea86bc8d1fe47ec0b51ba37 (patch)
treee93e9c07cd61311d63aa589cfd2452662dfcafb5 /Documentation
parentf364f02724d6ce4c64fae85a86e0452b5634ddf8 (diff)
parent612c49e94d5c761bd9fc4752283b82786c23856a (diff)
downloadgit-78cf8efec34c419ecea86bc8d1fe47ec0b51ba37.tar.gz
Merge branch 'dl/credential-cache-socket-in-xdg-cache'
The default location "~/.git-credential-cache/socket" for the socket used to communicate with the credential-cache daemon has been moved to "~/.cache/git/credential/socket". * dl/credential-cache-socket-in-xdg-cache: credential-cache: add tests for XDG functionality credential-cache: use XDG_CACHE_HOME for socket path.c: add xdg_cache_home
Diffstat (limited to 'Documentation')
-rw-r--r--Documentation/git-credential-cache.txt11
1 files changed, 7 insertions, 4 deletions
diff --git a/Documentation/git-credential-cache.txt b/Documentation/git-credential-cache.txt
index 96208f822e..2b85826393 100644
--- a/Documentation/git-credential-cache.txt
+++ b/Documentation/git-credential-cache.txt
@@ -33,10 +33,13 @@ OPTIONS
--socket <path>::
Use `<path>` to contact a running cache daemon (or start a new
- cache daemon if one is not started). Defaults to
- `~/.git-credential-cache/socket`. If your home directory is on a
- network-mounted filesystem, you may need to change this to a
- local filesystem. You must specify an absolute path.
+ cache daemon if one is not started).
+ Defaults to `$XDG_CACHE_HOME/git/credential/socket` unless
+ `~/.git-credential-cache/` exists in which case
+ `~/.git-credential-cache/socket` is used instead.
+ If your home directory is on a network-mounted filesystem, you
+ may need to change this to a local filesystem. You must specify
+ an absolute path.
CONTROLLING THE DAEMON
----------------------