summaryrefslogtreecommitdiff
path: root/Documentation/git-config.txt
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2013-07-22 18:24:09 (GMT)
committerJunio C Hamano <gitster@pobox.com>2013-07-22 18:24:09 (GMT)
commitc714f9fd8addc752aaaf1f97bb2be311d9156def (patch)
tree7ec7cf29beede6f5a38729172db8cfd7e4794017 /Documentation/git-config.txt
parent4c72ee838f1085a47a3c5144ce1088f1bca42f66 (diff)
parentb2dc09455a9ed5521c2e84fc67d8dacf2c28c39f (diff)
downloadgit-c714f9fd8addc752aaaf1f97bb2be311d9156def.zip
git-c714f9fd8addc752aaaf1f97bb2be311d9156def.tar.gz
git-c714f9fd8addc752aaaf1f97bb2be311d9156def.tar.bz2
Merge branch 'hv/config-from-blob'
Allow configuration data to be read from in-tree blob objects, which would help working in a bare repository and submodule updates. * hv/config-from-blob: do not die when error in config parsing of buf occurs teach config --blob option to parse config from database config: make parsing stack struct independent from actual data source config: drop cf validity check in get_next_char() config: factor out config file stack management
Diffstat (limited to 'Documentation/git-config.txt')
-rw-r--r--Documentation/git-config.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt
index 99dc497..34b0894 100644
--- a/Documentation/git-config.txt
+++ b/Documentation/git-config.txt
@@ -127,6 +127,13 @@ See also <<FILES>>.
--file config-file::
Use the given config file instead of the one specified by GIT_CONFIG.
+--blob blob::
+ Similar to '--file' but use the given blob instead of a file. E.g.
+ you can use 'master:.gitmodules' to read values from the file
+ '.gitmodules' in the master branch. See "SPECIFYING REVISIONS"
+ section in linkgit:gitrevisions[7] for a more complete list of
+ ways to spell blob names.
+
--remove-section::
Remove the given section from the configuration file.