User config file location now complies with XDG base directory specification Signed-off-by: Astril Hayato <astrilhayato@xxxxxxxxx> --- Documentation/gitk.txt | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt index 1e9e38a..c2aa514 100644 --- a/Documentation/gitk.txt +++ b/Documentation/gitk.txt @@ -166,8 +166,13 @@ 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 (in order of priority): + +* '$XDG_CONFIG_HOME/git/gitk' if it exists and '$XDG_CONFIG_HOME' is set +* '$HOME/.config/git/gitk' if it exists +* '$HOME/.gitk' if it exists + +If none of the above exist then '$HOME/.config/git/gitk' is created and used by default. History ------- -- 1.9.0 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html