From: Spencer E. Olson <olsonse@umich.edu>
Date: Thu, 17 Feb 2011 16:18:45 +0000 (-0700)
Subject: submodule: no [--merge|--rebase] when newly cloned
X-Git-Tag: v1.7.4.2~7^2~1
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/1b4735d9f3e0b7ea62c7c22f0afcb45e10c46c7e?hp=1b4735d9f3e0b7ea62c7c22f0afcb45e10c46c7e

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>
---