From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: js/rebase-cleanup, was Re: What's cooking in git.git (May 2019, #03; Sun, 19)
Date: Tue, 21 May 2019 20:32:35 +0200 (CEST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1905212028240.46@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqqv9y6zufi.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Sun, 19 May 2019, Junio C Hamano wrote:
> The first release candidate Git 2.22-rc1 has been tagged. There
> still are a few topics from 'next' that need to go to 'master'
> before the final, but otherwise this should be pretty close to the
> final version. Knock knock...
Fingers crossed!
> I'll be offline for a week or so and will tag -rc2 early next week
> when I get back to the US.
Enjoy your time off.
> * js/rebase-cleanup (2019-05-15) 5 commits
> (merged to 'next' on 2019-05-16 at ccfed8f263)
> + rebase: fold git-rebase--common into the -p backend
> + sequencer: the `am` and `rebase--interactive` scripts are gone
> + .gitignore: there is no longer a built-in `git-rebase--interactive`
> + t3400: stop referring to the scripted rebase
> + Drop unused git-rebase--am.sh
>
> Update supporting parts of "git rebase" to remove code that should
> no longer be used.
>
> Will cook in 'next'.
I guess you're saying that this is *not* one of those branches you want to
still merge into `master` before v2.22.0... Is this reading correct?
I ask because I have one more patch in the queue that cleans up the
NEEDSWORK in git.c that we can now address, and I kept it out of the patch
series in order to make it easier to merge down before v2.22 final...
Ciao,
Dscho
prev parent reply other threads:[~2019-05-21 18:32 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-05-19 9:04 What's cooking in git.git (May 2019, #03; Sun, 19) Junio C Hamano
2019-05-21 18:32 ` Johannes Schindelin [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
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=nycvar.QRO.7.76.6.1905212028240.46@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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).