diff options
| author | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:10:17 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2012-09-11 11:10:17 -0700 |
| commit | ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44 (patch) | |
| tree | 2dfda34bb7872b99c9af10b66201b596663b5370 /Documentation | |
| parent | ef92392b6c8596b61eab6f2045a54c086f340cf7 (diff) | |
| parent | 01d4721565f1562172149ebb91d29d6a7e7f922d (diff) | |
| download | git-ee7a83f6314a6fe281c8e3e041cfd42b5a2deb44.tar.gz | |
Merge branch 'sz/submodule-force-update' into maint-1.7.11
* sz/submodule-force-update:
Make 'git submodule update --force' always check out submodules.
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-submodule.txt | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index fbbbcb282c..2de7bf0900 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -149,6 +149,11 @@ submodule with the `--init` option. + If `--recursive` is specified, this command will recurse into the registered submodules, and update any nested submodules within. ++ +If `--force` is specified, the submodule will be checked out (using +`git checkout --force` if appropriate), even if the commit specified in the +index of the containing repository already matches the commit checked out in +the submodule. summary:: Show commit summary between the given commit (defaults to HEAD) and @@ -210,7 +215,9 @@ OPTIONS This option is only valid for add and update commands. When running add, allow adding an otherwise ignored submodule path. When running update, throw away local changes in submodules when - switching to a different commit. + switching to a different commit; and always run a checkout operation + in the submodule, even if the commit listed in the index of the + containing repository matches the commit checked out in the submodule. --cached:: This option is only valid for status and summary commands. These |