diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2010-08-05 22:40:48 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2010-08-09 16:11:44 (GMT) |
| commit | 302ad7a9930a34413418b6436f96826070367647 (patch) | |
| tree | 5cd126308137179d75632405e3c084950d8c4e34 /submodule.h | |
| parent | aee9c7d6540fe6f66fbbe7be420caa26ae0fa2d9 (diff) | |
| download | git-302ad7a9930a34413418b6436f96826070367647.zip git-302ad7a9930a34413418b6436f96826070367647.tar.gz git-302ad7a9930a34413418b6436f96826070367647.tar.bz2 | |
Submodules: Use "ignore" settings from .gitmodules too for diff and status
The .gitmodules file is parsed for "submodule.<name>.ignore" entries
before looking for them in .git/config. Thus settings found in .git/config
will override those from .gitmodules, thereby allowing the local developer
to ignore settings given by the remote side while also letting upstream
set defaults for those users who don't have special needs.
Signed-off-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'submodule.h')
| -rw-r--r-- | submodule.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/submodule.h b/submodule.h index 185a5ce..8ac4037 100644 --- a/submodule.h +++ b/submodule.h @@ -5,6 +5,7 @@ struct diff_options; void set_diffopt_flags_from_submodule_config(struct diff_options *diffopt, const char *path); +void gitmodules_config(); int parse_submodule_config_option(const char *var, const char *value); void handle_ignore_submodules_arg(struct diff_options *diffopt, const char *); void show_submodule_summary(FILE *f, const char *path, |