[PATCH] Documentation/gitk: Document new config file location

Astril Hayato· Mar 16, 2014, 14:10 UTC · lore

User configuration file is now stored at $XDG_CONFIG_HOME/git/gitk

Signed-off-by: Astril Hayato <astrilhayato@gmail.com>
---
 Documentation/gitk.txt | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Show changes to Documentation/gitk.txt +2 −2

diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
index 1e9e38a..417a707 100644
--- a/Documentation/gitk.txt
+++ b/Documentation/gitk.txt
@@ -166,8 +166,8 @@ 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 or
+$HOME/.config/git/gitk if $XDG_CONFIG_HOME is not set.
 
 History
 -------

-- 
1.9.0

Junio C Hamano· Mar 17, 2014, 22:19 UTC · re: Astril Hayato · lore

Re: [PATCH] Documentation/gitk: Document new config file location

Astril Hayato <astrilhayato@gmail.com> writes:

Show 19 quoted lines

> User configuration file is now stored at $XDG_CONFIG_HOME/git/gitk
>
> Signed-off-by: Astril Hayato <astrilhayato@gmail.com>
> ---
>  Documentation/gitk.txt | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/Documentation/gitk.txt b/Documentation/gitk.txt
> index 1e9e38a..417a707 100644
> --- a/Documentation/gitk.txt
> +++ b/Documentation/gitk.txt
> @@ -166,8 +166,8 @@ 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 or
> +$HOME/.config/git/gitk if $XDG_CONFIG_HOME is not set.

It is a bit more complex than that, isn't it?

 - $XDG_CONFIG_HOME/git/gitk is used if $XDG_CONFIG_HOME is set; otherwise
 - $HOME/.gitk is used, if you already have one; otherwise
 - $HOME/.config/git/gitk is used.

patchDocumentation/gitk: Document new config file location