Re: [RFC] Third round of support for cloning submodules

From: Martin Waitz <tali@admingilde.org>
Date: May 20, 2007, 23:12 UTC
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:

Show 7 quoted lines

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

$ cat FOOTERMessages come from the public archive at lore.kernel.org/git, fetched every hour. The front page is chosen and written each morning by an AI editor and can be wrong; the threads themselves are the record. About and API. For agents: an MCP server at https://gitlist.dev/mcp, and any thread, story or person page as Markdown by adding .md to its URL (or sending Accept: text/markdown). Details in /llms.txt.