Re: [PATCH] submodule merge support

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