diff options
| author | Junio C Hamano <junio@hera.kernel.org> | 2009-06-21 08:03:25 +0000 |
|---|---|---|
| committer | Junio C Hamano <junio@hera.kernel.org> | 2009-06-21 08:03:25 +0000 |
| commit | 0e88f3e399da078c8e389db57ca99569c3fdd3a8 (patch) | |
| tree | c7ec4e6fd1a6c15ab346f0f203e5cf804607cd68 /git-submodule.txt | |
| parent | f43de609d47d6cec7e8d5e363f372455f59a7ecd (diff) | |
| download | git-htmldocs-0e88f3e399da078c8e389db57ca99569c3fdd3a8.tar.gz | |
Autogenerated HTML docs for v1.6.3.2-363-gc5764
Diffstat (limited to 'git-submodule.txt')
| -rw-r--r-- | git-submodule.txt | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/git-submodule.txt b/git-submodule.txt index cd8e861ce..470bd75ad 100644 --- a/git-submodule.txt +++ b/git-submodule.txt @@ -115,8 +115,9 @@ init:: update:: Update the registered submodules, i.e. clone missing submodules and checkout the commit specified in the index of the containing repository. - This will make the submodules HEAD be detached unless '--rebase' is - specified or the key `submodule.$name.update` is set to `rebase`. + This will make the submodules HEAD be detached unless '--rebase' or + '--merge' is specified or the key `submodule.$name.update` is set to + `rebase` or `merge`. + If the submodule is not yet initialized, and you just want to use the setting as stored in .gitmodules, you can automatically initialize the @@ -180,6 +181,16 @@ OPTIONS This option is only valid for the update command. Don't fetch new objects from the remote site. +--merge:: + This option is only valid for the update command. + Merge the commit recorded in the superproject into the current branch + of the submodule. If this option is given, the submodule's HEAD will + not be detached. If a merge failure prevents this process, you will + have to resolve the resulting conflicts within the submodule with the + usual conflict resolution tools. + If the key `submodule.$name.update` is set to `merge`, this option is + implicit. + --rebase:: This option is only valid for the update command. Rebase the current branch onto the commit recorded in the |