From: Martin Waitz <tali@admingilde.org>
Date: Sun, 20 May 2007 23:12:01 GMT
Subject: Re: [RFC] Third round of support for cloning submodules
Message-ID: <20070520231200.GR5412@admingilde.org>
In-Reply-To: <20070520230248.GI25462@steel.home>

hoi :)

On Mon, May 21, 2007 at 01:02:48AM +0200, Alex Riesen wrote:
> > If the user did commit and then you do a supermodule checkout -m you
> > will get a merge.
> 
> Only if the user continue to use the last branch (or the detached
> head) the subproject was on. He don't have to, he can even return to
> the commit which does not conflict, unless he have to complicate
> things.

just curious:
so you want to differenciate between a subproject HEAD which was
set by the superproject and other ones?

-- 
Martin Waitz