tree 587a7bdac48b280635eb73300dc4ddc129102d1b
parent 7ed863a85a6ce2c4ac4476848310b8f917ab41f9
author Spencer E. Olson <olsonse@umich.edu> 1297959525 -0700
committer Junio C Hamano <gitster@pobox.com> 1297973958 -0800

submodule: no [--merge|--rebase] when newly cloned

"git submodule update" can be run with either the "--merge" or "--rebase"
option, or submodule.<name>.update configuration variable can be set to
"merge" or "rebase, to cause local work to get integrated when updating
the submodule.

When a submodule is newly cloned, however, it does not have a check out
when a rebase or merge is attempted, leading to a failure.  For newly
cloned submodules, simply check out the appropriate revision.  There is no
local work to integrate with for them.

Signed-off-by: Spencer E. Olson <olsonse@umich.edu>
Acked-by: Jens Lehmann <Jens.Lehmann@web.de>
Signed-off-by: Junio C Hamano <gitster@pobox.com>