From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org
Subject: builtin stash/rebase, was Re: What's cooking in git.git (Oct 2018, #01; Wed, 10)
Date: Wed, 10 Oct 2018 14:57:35 +0200 (DST) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1810101203571.2034@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <xmqq8t36mk4t.fsf@gitster-ct.c.googlers.com>
Hi Junio,
On Wed, 10 Oct 2018, Junio C Hamano wrote:
> We haven't seen much complaints and breakages reported against the
> two big "rewrite in C" topics around "rebase"; perhaps it is a good
> time to merge them to 'next' soonish to cook them for a few weeks
> before moving them to 'master'?
I would be in favor, as long as the fixup patches I have in Git for
Windows made it in:
https://github.com/git-for-windows/git/commit/6bc7024aecdb1aeb2760c519f7b26e6e5ef21051
fixup! builtin rebase: support `-C` and `--whitespace=<type>`
https://github.com/git-for-windows/git/commit/1e6a1c510ffeae5bb0a4bda7f0528a8213728837
fixup! builtin rebase: support `--gpg-sign` option
https://github.com/git-for-windows/git/commit/ddb6e5ca19d5cdd318bc4bcbb7f7f3fb0892c8cc
fixup! rebase -i: implement the main part of interactive rebase as a builtin
https://github.com/git-for-windows/git/commit/2af24038a95a3879aa0c29d91a43180b9465247e
fixup! stash: convert apply to builtin
It seems that Alban picked up the `rebase -i` one, but the other three
have not made it into `pu` yet (the two `rebase` ones are really my fault,
I did not yet find time).
Speaking about the two `rebase` ones: they are simple fixup! commits,
could I trouble you to fetch and cherry-pick them into `pu`, or would you
prefer if I sent another iteration of `rebase-in-c-4-opts`?
Ciao,
Dscho
next prev parent reply other threads:[~2018-10-10 12:57 UTC|newest]
Thread overview: 34+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-10 5:43 What's cooking in git.git (Oct 2018, #01; Wed, 10) Junio C Hamano
2018-10-10 7:59 ` Ævar Arnfjörð Bjarmason
2018-10-10 15:06 ` Jeff King
2018-10-10 12:57 ` Johannes Schindelin [this message]
2018-10-10 13:19 ` builtin stash/rebase, was " Junio C Hamano
2018-10-11 2:18 ` Junio C Hamano
2018-10-10 13:04 ` js/mingw-wants-vista-or-above, " Johannes Schindelin
2018-10-10 13:13 ` Junio C Hamano
2018-10-10 13:58 ` Phillip Wood
2018-10-11 1:54 ` Junio C Hamano
2018-10-11 22:40 ` Junio C Hamano
2018-10-11 22:59 ` [PATCH] diff.c: die on unknown color-moved ws mode Stefan Beller
2018-10-11 23:01 ` Stefan Beller
2018-10-12 1:22 ` Junio C Hamano
2018-10-11 23:06 ` What's cooking in git.git (Oct 2018, #01; Wed, 10) Stefan Beller
2018-10-12 0:51 ` Junio C Hamano
2018-10-12 9:59 ` Phillip Wood
2018-10-12 13:36 ` Junio C Hamano
2018-10-16 13:38 ` Phillip Wood
2018-10-16 17:13 ` Stefan Beller
2018-10-10 14:18 ` Thomas Gummerer
2018-10-11 1:40 ` Junio C Hamano
2018-10-10 18:51 ` `--rebase-merges' still failing badly Michael Witten
2018-10-10 19:00 ` Michael Witten
2018-10-10 23:01 ` Junio C Hamano
2018-10-11 2:44 ` Michael Witten
2018-10-12 9:11 ` Johannes Schindelin
2018-10-10 18:55 ` What's cooking in git.git (Oct 2018, #01; Wed, 10) Stefan Beller
2018-10-11 2:00 ` Junio C Hamano
2018-10-10 20:38 ` Tim Schumacher
2018-10-10 21:25 ` Johannes Sixt
2018-10-11 1:53 ` Junio C Hamano
2018-10-11 11:16 ` Derrick Stolee
2018-10-14 12:21 ` Duy Nguyen
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.1810101203571.2034@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).