From: Alex Riesen <raa.lkml@gmail.com>
To: Martin Waitz <tali@admingilde.org>
Cc: Junio C Hamano <junkio@cox.net>, git@vger.kernel.org
Subject: Re: [PATCH] submodule merge support
Date: Mon, 7 May 2007 00:07:45 +0200 [thread overview]
Message-ID: <20070506220745.GA2439@steel.home> (raw)
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)?
next prev parent reply other threads:[~2007-05-06 22:07 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-05-06 19:02 [PATCH] submodule merge support Martin Waitz
2007-05-06 22:07 ` Alex Riesen [this message]
2007-05-06 22:16 ` Martin Waitz
2007-05-06 22:18 ` Linus Torvalds
2007-05-07 9:03 ` Martin Waitz
2007-05-07 10:30 ` Johannes Sixt
2007-05-07 16:02 ` Linus Torvalds
2007-05-07 16:44 ` Martin Waitz
[not found] ` <alpine.LFD.0.98.0705070959060.3802@woody.linux-foundation.org>
[not found] ` <alpine.LFD.0.98.0705071015230.3802@woody.linux-foundation.org>
2007-05-07 19:33 ` Martin Waitz
2007-05-07 16:37 ` Martin Waitz
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20070506220745.GA2439@steel.home \
--to=raa.lkml@gmail.com \
--cc=git@vger.kernel.org \
--cc=junkio@cox.net \
--cc=tali@admingilde.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).