diff options
| author | Jens Lehmann <Jens.Lehmann@web.de> | 2011-03-06 22:11:21 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-03-09 21:10:35 (GMT) |
| commit | 8f0700dd33f63e594b9b34c84efe94e670ea4f45 (patch) | |
| tree | 3d1640ca9db94519f5a9355664b56a5d773b0d47 /submodule.h | |
| parent | 88a21979c5717e3f37b9691e90b6dbf2b94c751a (diff) | |
| download | git-8f0700dd33f63e594b9b34c84efe94e670ea4f45.zip git-8f0700dd33f63e594b9b34c84efe94e670ea4f45.tar.gz git-8f0700dd33f63e594b9b34c84efe94e670ea4f45.tar.bz2 | |
fetch/pull: Add the 'on-demand' value to the --recurse-submodules option
Until now the --recurse-submodules option could only be used to either
fetch all populated submodules recursively or to disable recursion
completely. As fetch and pull now by default just fetch those submodules
for which new commits have been fetched in the superproject, a command
line option to enforce that behavior is needed to be able to override
configuration settings.
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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/submodule.h b/submodule.h index 3434a8e..5350b0d 100644 --- a/submodule.h +++ b/submodule.h @@ -24,7 +24,7 @@ void show_submodule_summary(FILE *f, const char *path, void set_config_fetch_recurse_submodules(int value); void check_for_new_submodule_commits(unsigned char new_sha1[20]); int fetch_populated_submodules(int num_options, const char **options, - const char *prefix, int ignore_config, + const char *prefix, int command_line_option, int quiet); unsigned is_submodule_modified(const char *path, int ignore_untracked); int merge_submodule(unsigned char result[20], const char *path, const unsigned char base[20], |