From: Junio C Hamano <gitster@pobox.com>
To: Stefan Beller <sbeller@google.com>
Cc: "git\@vger.kernel.org" <git@vger.kernel.org>
Subject: Re: What's cooking in git.git (May 2017, #08; Mon, 29)
Date: Wed, 31 May 2017 08:07:48 +0900 [thread overview]
Message-ID: <xmqqshjm9c57.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <CAGZ79kZWmLnUr5hyKjy8bKFAksURW9a65035CHispAT0oH1rkA@mail.gmail.com> (Stefan Beller's message of "Tue, 30 May 2017 10:42:10 -0700")
Stefan Beller <sbeller@google.com> writes:
>>
>> * sb/submodule-blanket-recursive (2017-05-23) 6 commits
> ...
>
> And the retraction is retracted by sending a new series.
> You remarked that it still misbehaves with other series in flight,
> so I'll inspect it again.
What I said (or at least what I ment to say) was "it looked like it
is based on an older codebase and I do not yet know how messy the
conflict resolution and resulting history would look like".
next prev parent reply other threads:[~2017-05-30 23:07 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-05-29 6:23 What's cooking in git.git (May 2017, #08; Mon, 29) Junio C Hamano
2017-05-29 7:51 ` Samuel Lijin
2017-05-30 0:35 ` Junio C Hamano
2017-05-30 17:42 ` Stefan Beller
2017-05-30 23:07 ` Junio C Hamano [this message]
2017-05-31 3:18 ` Daniel Ferreira (theiostream)
2017-05-31 5:58 ` Stefan Beller
2017-05-31 18:59 ` Ævar Arnfjörð Bjarmason
2017-06-01 0:48 ` Junio C Hamano
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqshjm9c57.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
--cc=sbeller@google.com \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).