From: Junio C Hamano <gitster@pobox.com>
To: Johannes Schindelin <Johannes.Schindelin@gmx.de>
Cc: git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jul 2017, #07; Mon, 24)
Date: Tue, 25 Jul 2017 12:30:51 -0700 [thread overview]
Message-ID: <xmqqy3rcuxec.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <alpine.DEB.2.21.1.1707252046190.4271@virtualbox> (Johannes Schindelin's message of "Tue, 25 Jul 2017 21:22:19 +0200 (CEST)")
Johannes Schindelin <Johannes.Schindelin@gmx.de> writes:
> Hi Junio,
>
> On Mon, 24 Jul 2017, Junio C Hamano wrote:
>
>> * js/blame-lib (2017-07-24) 1 commit
>> - blame: fix memory corruption scrambling revision name in error message
>>
>> A hotfix to a topic already in 'master'.
>>
>> Will merge to 'next'.
>
> This sounds more critical than `next`, in particular since you said that
> you do not want to move anything from `next` to `master` before 2.14
> final.
That is why it is not "Will merge to and cook in 'next'" which is a
norm for new things during -rc.
>> The final batch to "git rebase -i" updates to move more code from
>> the shell script to C.
>>
>> Expecting a reroll.
>
> Since you said yourself that you won't pick up v6...
Read the message again and realize that I said won't during -rc
but may hold onto it. I am intending to queue it on 2.14 final
to merge to 'pu' until the topic is rerolled again.
next prev parent reply other threads:[~2017-07-25 19:30 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-07-24 22:49 What's cooking in git.git (Jul 2017, #07; Mon, 24) Junio C Hamano
2017-07-25 19:22 ` Johannes Schindelin
2017-07-25 19:30 ` Junio C Hamano [this message]
2017-07-26 18: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=xmqqy3rcuxec.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.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.
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).