On Mon, Jul 08, 2013 at 12:00:02AM +0200, Robin Rosenberg wrote: > Signed-off-by: Robin Rosenberg <robin.rosenb...@dewire.com> > --- > Documentation/git-config.txt | 6 ++++-- > 1 file changed, 4 insertions(+), 2 deletions(-) > > diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt > index 9ae2508..3198d52 100644 > --- a/Documentation/git-config.txt > +++ b/Documentation/git-config.txt > @@ -107,7 +107,8 @@ See also <<FILES>>. > > --system:: > For writing options: write to system-wide $(prefix)/etc/gitconfig > - rather than the repository .git/config. > + rather than the repository .git/config. However, $(prefix) is /usr > + then /etc/gitconfig is used.
That's a build time condition, not something that's decided at runtime so I'm not sure that this logic belongs in the user facing documentation. The technically correct change would be to use "$(sysconfdir)/gitconfig" but I think that will just confuse users more. Since we have a build step for the documentation, I wonder if it's possible to replace these with the correct directory at build time. > + > For reading options: read only from system-wide $(prefix)/etc/gitconfig > rather than from all available files. > @@ -214,7 +215,8 @@ $XDG_CONFIG_HOME/git/config:: > file was added fairly recently. > > $(prefix)/etc/gitconfig:: > - System-wide configuration file. > + System-wide configuration file, unless $(prefix) is /usr. In the > + latter case /etc/gitconfig is used. > > If no further options are given, all reading options will read all of these > files that are available. If the global or the system-wide configuration > -- > 1.8.3.rc0.19.g7e6a0cc -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html