2011/3/18 Junio C Hamano <gitster@xxxxxxxxx>: > Carl FÃrstenberg <azatoth@xxxxxxxxx> writes: > >> Sorry for re-posting the question but I though I should explain the >> issue better and to fix the subject line. >> sub >> When you are cloning repository containing submodules, and you are >> using the --merge flag to "git submodule update" the first time, then >> the submodule instance in question will assume you want to delete all >> files present in the module. > > Is this something we fixed last month? > > commit 1b4735d9f3e0b7ea62c7c22f0afcb45e10c46c7e > Author: Spencer E. Olson <olsonse@xxxxxxxxx> > Date: Â Thu Feb 17 09:18:45 2011 -0700 > > Â Â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@xxxxxxxxx> > Â ÂAcked-by: Jens Lehmann <Jens.Lehmann@xxxxxx> > Â ÂSigned-off-by: Junio C Hamano <gitster@xxxxxxxxx> > -- > To unsubscribe from this list: send the line "unsubscribe git" in > the body of a message to majordomo@xxxxxxxxxxxxxxx > More majordomo info at Âhttp://vger.kernel.org/majordomo-info.html > Ah, I see, thank you, I was using 1.7.4 and I assume this is for next. -- Carl FÃrstenberg -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html