From: "Junio C Hamano" <gits...@pobox.com>
"W. Trevor King" <wk...@tremily.us> writes:
[...]
@@ -155,13 +155,31 @@ it contains local modifications.
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` or
- `--merge` is specified or the key `submodule.$name.update` is set
to
- `rebase`, `merge` or `none`. `none` can be overridden by specifying
- `--checkout`. Setting the key `submodule.$name.update` to
`!command`
- will cause `command` to be run. `command` can be any arbitrary
shell
- command that takes a single argument, namely the sha1 to update to.
+ checkout the commit specified in the index of the containing
+ repository. The update mode defaults to 'checkout', but be
nit: s/but be/but can be/ ?
+ configured with the 'submodule.<name>.update' setting or the
+ '--rebase', '--merge', or 'checkout' options.
[...]
--
To unsubscribe from this list: send the line "unsubscribe git" in
the body of a message to majord...@vger.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
