From: Linus Torvalds Date: Sun, 06 May 2007 22:18:53 GMT Subject: Re: [PATCH] submodule merge support Message-ID: In-Reply-To: <20070506220745.GA2439@steel.home> On Mon, 7 May 2007, Alex Riesen wrote: > 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)? Yes, I think that's the right thing to do. I think it's the right thing for another reason: in a true "recursive" merge, the submodules shouldn't be recursively merged anyway. *THEIR* merge will have its own history, and doing it based on some random history of the superproject is actually wrong anyway! Linus