diff options
| author | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:24:09 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2013-07-22 11:24:09 -0700 |
| commit | c714f9fd8addc752aaaf1f97bb2be311d9156def (patch) | |
| tree | 7ec7cf29beede6f5a38729172db8cfd7e4794017 /Documentation | |
| parent | 4c72ee838f1085a47a3c5144ce1088f1bca42f66 (diff) | |
| parent | b2dc09455a9ed5521c2e84fc67d8dacf2c28c39f (diff) | |
| download | git-c714f9fd8addc752aaaf1f97bb2be311d9156def.tar.gz | |
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')
| -rw-r--r-- | Documentation/git-config.txt | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/Documentation/git-config.txt b/Documentation/git-config.txt index 99dc497b6f..34b0894646 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. |