diff options
| author | Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:08 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2014-03-28 13:51:09 -0700 |
| commit | b2273d06033e5989ca30a72492ca894d0416354f (patch) | |
| tree | a6a79dabf83fc2081b3d10ed3fd1ca9fab409fdb | |
| parent | c301a23ff8701ae2a50c62c00c400f87e6585511 (diff) | |
| parent | 36dc827bc9d17f80ed4f326de21247a5d1341fbc (diff) | |
| download | git-b2273d06033e5989ca30a72492ca894d0416354f.tar.gz | |
Merge branch 'ah/doc-gitk-config'
* ah/doc-gitk-config:
Documentation/gitk: document the location of the configulation file
| -rw-r--r-- | Documentation/gitk.txt | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 1e9e38ae40..7e03fcc62d 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -166,8 +166,14 @@ gitk --max-count=100 --all \-- Makefile:: Files ----- -Gitk creates the .gitk file in your $HOME directory to store preferences -such as display options, font, and colors. +User configuration and preferences are stored at: + +* '$XDG_CONFIG_HOME/git/gitk' if it exists, otherwise +* '$HOME/.gitk' if it exists + +If neither of the above exist then '$XDG_CONFIG_HOME/git/gitk' is created and +used by default. If '$XDG_CONFIG_HOME' is not set it defaults to +'$HOME/.config' in all cases. History ------- |