From: Alex Riesen <raa.lkml@gmail.com>
Date: Sun, 06 May 2007 22:07:45 GMT
Subject: Re: [PATCH] submodule merge support
Message-ID: <20070506220745.GA2439@steel.home>
In-Reply-To: <20070506190224.GG30511@admingilde.org>

Martin Waitz, Sun, May 06, 2007 21:02:24 +0200:
> When merge-recursive gets to a dirlink, it starts an automatic
> submodule merge and then uses the resulting merge commit for the
> top-level tree.

merge-recursive is a mess already, you just made even more so.
Besides, you completely forgot all other merge strategies.

How about making all existing strategies just ignore submodules, and
move recursive merge in the merge driver (git-merge.sh)?