diff options
| author | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-22 12:47:45 +0200 |
|---|---|---|
| committer | Kostis Anagnostopoulos <ankostis@gmail.com> | 2016-10-22 12:47:45 +0200 |
| commit | a25365fea0ea3b92ba96cc281facd308311def1e (patch) | |
| tree | 5653a9923aebfc8b53407f8d1ef0d9d6497da081 /git/config.py | |
| parent | 76ac61a2b4bb10c8434a7d6fc798b115b4b7934d (diff) | |
| parent | caa0ea7a0893fe90ea043843d4e6ad407126d7b8 (diff) | |
| download | gitpython-a25365fea0ea3b92ba96cc281facd308311def1e.tar.gz | |
Merge remote-tracking branch 'origin/master' into exp_git_dir
Diffstat (limited to 'git/config.py')
| -rw-r--r-- | git/config.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/git/config.py b/git/config.py index a0b25822..f530bac8 100644 --- a/git/config.py +++ b/git/config.py @@ -198,7 +198,7 @@ class GitConfigParser(with_metaclass(MetaParserBuilder, cp.RawConfigParser, obje configuration files have been included :param merge_includes: if True, we will read files mentioned in [include] sections and merge their contents into ours. This makes it impossible to write back an individual configuration file. - Thus, if you want to modify a single conifguration file, turn this off to leave the original + Thus, if you want to modify a single configuration file, turn this off to leave the original dataset unaltered when reading it.""" cp.RawConfigParser.__init__(self, dict_type=OrderedDict) @@ -275,7 +275,7 @@ class GitConfigParser(with_metaclass(MetaParserBuilder, cp.RawConfigParser, obje """A direct copy of the py2.4 version of the super class's _read method to assure it uses ordered dicts. Had to change one line to make it work. - Future versions have this fixed, but in fact its quite embarassing for the + Future versions have this fixed, but in fact its quite embarrassing for the guys not to have done it right in the first place ! Removed big comments to make it more compact. @@ -472,7 +472,7 @@ class GitConfigParser(with_metaclass(MetaParserBuilder, cp.RawConfigParser, obje # end assert multiple files if self._has_includes(): - log.debug("Skipping write-back of confiuration file as include files were merged in." + + log.debug("Skipping write-back of configuration file as include files were merged in." + "Set merge_includes=False to prevent this.") return # end |