git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
* [PATCH] Documentation/gitk: Document new config file location
@ 2014-03-16 14:10 Astril Hayato
  2014-03-17 22:19 ` Junio C Hamano
  0 siblings, 1 reply; 2+ messages in thread
From: Astril Hayato @ 2014-03-16 14:10 UTC (permalink / raw)
  To: git; +Cc: gitster, Astril Hayato

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.
 
 History
 -------
-- 
1.9.0

^ permalink raw reply related	[flat|nested] 2+ messages in thread

* Re: [PATCH] Documentation/gitk: Document new config file location
  2014-03-16 14:10 [PATCH] Documentation/gitk: Document new config file location Astril Hayato
@ 2014-03-17 22:19 ` Junio C Hamano
  0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2014-03-17 22:19 UTC (permalink / raw)
  To: Astril Hayato; +Cc: git

Astril Hayato <astrilhayato@gmail.com> writes:

> 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.

^ permalink raw reply	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2014-03-17 22:19 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2014-03-16 14:10 [PATCH] Documentation/gitk: Document new config file location Astril Hayato
2014-03-17 22:19 ` Junio C Hamano

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).