diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-05-02 15:58:36 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-05-02 15:58:36 -0700 |
| commit | 0d405d72f5ffb499b40dd3a95886ae5a1fc13b30 (patch) | |
| tree | 5508dff285aa24e08475eae9b2d7380800881e45 /Documentation | |
| parent | Merge branch 'jh/notes-add-ui' (diff) | |
| parent | submodule: Add --force option for git submodule update (diff) | |
| download | tgif-0d405d72f5ffb499b40dd3a95886ae5a1fc13b30.tar.xz | |
Merge branch 'nm/submodule-update-force'
* nm/submodule-update-force:
submodule: Add --force option for git submodule update
Conflicts:
t/t7406-submodule-update.sh
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/git-submodule.txt | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Documentation/git-submodule.txt b/Documentation/git-submodule.txt index 1a16ff6044..5e7a4130ee 100644 --- a/Documentation/git-submodule.txt +++ b/Documentation/git-submodule.txt @@ -186,8 +186,10 @@ OPTIONS -f:: --force:: - This option is only valid for the add command. - Allow adding an otherwise ignored submodule path. + 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. --cached:: This option is only valid for status and summary commands. These |