From: Florian Achleitner <florian.achleitner2.6.31@gmail.com>
To: Jonathan Nieder <jrnieder@gmail.com>
Cc: Junio C Hamano <gitster@pobox.com>,
git@vger.kernel.org, davidbarr@google.com,
Jeff King <peff@peff.net>
Subject: [PATCH v2] Update Documentation/git-config to reflect --local option.
Date: Sat, 05 May 2012 12:03:52 +0200 [thread overview]
Message-ID: <4557278.eakEfj5iWL@flomedio> (raw)
In-Reply-To: <20120504032400.GB2589@burratino>
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>
---
Updated with the formulation suggested by Junio.
Documentation/git-config.txt | 14 +++++++++-----
1 file changed, 9 insertions(+), 5 deletions(-)
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 81b0398..3f5d216 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -44,11 +44,15 @@ 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'
-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
-(see <<FILES>>).
+When reading, the values are read from the system, global and
+repository local configuration files by default, and options
+'--system', '--global', '--local' and '--file <filename>' can be
+used to tell the command to read from only that location (see <<FILES>>).
+
+When writing, the new value is written to the repository local
+configuration file by default, and options '--system', '--global',
+'--file <filename>' can be used to tell the command to write to
+that location (you can say '--local' but that is the default).
This command will fail (with exit code ret) if:
--
1.7.9.5
prev parent reply other threads:[~2012-05-05 10:04 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-03 22:44 [PATCH] Update Documentation/git-config to reflect --local option Florian Achleitner
2012-05-03 23:25 ` Junio C Hamano
2012-05-04 3:26 ` Jonathan Nieder
2012-05-05 10:03 ` Florian Achleitner [this message]
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=4557278.eakEfj5iWL@flomedio \
--to=florian.achleitner2.6.31@gmail.com \
--cc=davidbarr@google.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
--cc=peff@peff.net \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.