git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Florian Achleitner <florian.achleitner2.6.31@gmail.com>
To: git@vger.kernel.org
Cc: davidbarr@google.com, florian.achleitner.2.6.31@gmail.com,
	jrnieder@gmail.com
Subject: [PATCH] Update Documentation/git-config to reflect --local option.
Date: Fri, 04 May 2012 00:44:21 +0200	[thread overview]
Message-ID: <1754870.q6d2rgDqBT@flobuntu> (raw)

Describe config file selection in git-config.
While the usage message of git-config shows --local,
the documentation page did not contain anything about that.

Signed-off-by: Florian Achleitner <florian.achleitner.2.6.31@gmail.com>
---
This was pointed out in http://thread.gmane.org/gmane.comp.version-
control.git/196326

 Documentation/git-config.txt |    7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 81b0398..bda8bbb 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -44,10 +44,13 @@ a "true" or "false" string for bool), or '--path', which 
does some
 path expansion (see '--path' below).  If no type specifier is passed, no
 checks or transformations are performed on the value.
 
-The file-option can be one of '--system', '--global' or '--file'
+The file-option can be one of '--system', '--global', '--local', or '--file'
 which specify where the values will be read from or written to.
 The default is to assume the config file of the current repository,
-.git/config unless defined otherwise with GIT_DIR and GIT_CONFIG
+.git/config unless defined otherwise with GIT_DIR and GIT_CONFIG.
+For read commands like '--get' the default is to search local, global, and
+system config files (in this order) for the requested value and stop after
+the first finding.
 (see <<FILES>>).
 
 This command will fail (with exit code ret) if:
-- 
1.7.9.5

             reply	other threads:[~2012-05-03 22:45 UTC|newest]

Thread overview: 4+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-05-03 22:44 Florian Achleitner [this message]
2012-05-03 23:25 ` [PATCH] Update Documentation/git-config to reflect --local option Junio C Hamano
2012-05-04  3:26   ` Jonathan Nieder
2012-05-05 10:03     ` [PATCH v2] " Florian Achleitner

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1754870.q6d2rgDqBT@flobuntu \
    --to=florian.achleitner2.6.31@gmail.com \
    --cc=davidbarr@google.com \
    --cc=florian.achleitner.2.6.31@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=jrnieder@gmail.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).