From: Junio C Hamano <gitster@pobox.com>
To: Brad King <brad.king@kitware.com>
Cc: git@vger.kernel.org, Junio C Hamano <gitster@pobox.com>,
Heiko Voigt <hvoigt@hvoigt.net>
Subject: Re: [PATCH 0/2] Do not search submodules in deep recursive merge
Date: Thu, 13 Oct 2011 11:15:54 -0700 [thread overview]
Message-ID: <7v4nzc69lx.fsf@alter.siamese.dyndns.org> (raw)
In-Reply-To: cover.1318509069.git.brad.king@kitware.com
Brad King <brad.king@kitware.com> writes:
> On 10/12/2011 2:48 PM, Junio C Hamano wrote:
>> [Stalled]
>>
>> * hv/submodule-merge-search (2011-08-26) 5 commits
>> - submodule: Search for merges only at end of recursive merge
>> - allow multiple calls to submodule merge search for the same path
>> - submodule: Demonstrate known breakage during recursive merge
>> - push: Don't push a repository with unpushed submodules
>> - push: teach --recurse-submodules the on-demand option
>> (this branch is tangled with fg/submodule-auto-push.)
>
> AFAICT these two topics are tangled due revision traversal interactions.
> I've untangled the two "submodule:" commits from this stalled topic and
> rebased on master (34c4461a) resolving one conflict.
Thanks.
prev parent reply other threads:[~2011-10-13 18:16 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-10-12 18:48 What's cooking in git.git (Oct 2011, #04; Wed, 12) Junio C Hamano
2011-10-12 19:02 ` Jeff King
2011-10-12 19:05 ` Junio C Hamano
2011-10-13 6:02 ` Jakub Narebski
2011-10-13 12:59 ` [PATCH 0/2] Do not search submodules in deep recursive merge Brad King
2011-10-13 12:59 ` [PATCH 1/2] submodule: Demonstrate known breakage during " Brad King
2011-10-13 12:59 ` [PATCH 2/2] submodule: Search for merges only at end of " Brad King
2011-10-13 18:15 ` Junio C Hamano [this message]
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=7v4nzc69lx.fsf@alter.siamese.dyndns.org \
--to=gitster@pobox.com \
--cc=brad.king@kitware.com \
--cc=git@vger.kernel.org \
--cc=hvoigt@hvoigt.net \
/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).