From 36dc827bc9d17f80ed4f326de21247a5d1341fbc Mon Sep 17 00:00:00 2001 From: Astril Hayato Date: Thu, 20 Mar 2014 13:33:49 +0000 Subject: [PATCH] Documentation/gitk: document the location of the configulation file User config file location complies with the XDG base directory specification while supporting the traditional $HOME/.gitk as a fallback. Signed-off-by: Astril Hayato Signed-off-by: Junio C Hamano --- Documentation/gitk.txt | 10 ++++++++-- 1 file 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 ------- -- 2.11.4.GIT