Merge branch 'db/text-delta' into svn-fe

[git.git] / submodule.h

diff --git a/submodule.h b/submodule.h
index 3434a8eb96d19fb8d35678a2b3d590d9d2b04c4b..5350b0d5a0d16e12e96b983e6510cb1d4098f962 100644 (file)
--- 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],