From: Elijah Newren <newren@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: Git Mailing List <git@vger.kernel.org>,
Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: What's cooking in git.git (Jan 2019, #03; Fri, 18)
Date: Fri, 18 Jan 2019 17:13:08 -0800 [thread overview]
Message-ID: <CABPp-BFmYoeiOaB9Pf70TC3XftXjMEHGrPqxS8TgiiXR39q2rQ@mail.gmail.com> (raw)
In-Reply-To: <xmqqfttpimdc.fsf@gitster-ct.c.googlers.com>
On Fri, Jan 18, 2019 at 3:22 PM Junio C Hamano <gitster@pobox.com> wrote:
> * en/rebase-merge-on-sequencer (2019-01-07) 8 commits
> - rebase: implement --merge via the interactive machinery
> - rebase: define linearization ordering and enforce it
> - git-legacy-rebase: simplify unnecessary triply-nested if
> - git-rebase, sequencer: extend --quiet option for the interactive machinery
> - am, rebase--merge: do not overlook --skip'ed commits with post-rewrite
> - t5407: add a test demonstrating how interactive handles --skip differently
> - rebase: fix incompatible options error message
> - rebase: make builtin and legacy script error messages the same
>
> "git rebase --merge" as been reimplemented by reusing the internal
> machinery used for "git rebase -i".
>
> On hold.
> cf. <CABPp-BFckuONYcGGkCY3BuPypRULmhsk_OFHyYA2E4jM66BfeQ@mail.gmail.com>
Is the "on hold" comment still accurate? And if so, can I ask for
clarification on what the hold is so I can know what action if any I
need to take? The two things mentioned in the linked email that I see
are (1) the need to lower-case part of the subject (which you squashed
in already to create commit 68aa495b590d), and (2) the semantic
conflict between js/rebase-am and my patch, for which you already
squashed my fix into your merge of his series and suggested I not
resend and just let the rerere logic handle it (cf.
<xmqqmunxluj8.fsf@gitster-ct.c.googlers.com>)
I'm beginning to wonder if I should just resubmit patches individually
or take some other dramatic action as the combined amount of time this
series has been on hold has been quite a bit longer than usual for me.
Suggestions welcome.
Thanks,
Elijah
next prev parent reply other threads:[~2019-01-19 1:13 UTC|newest]
Thread overview: 4+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-01-18 23:20 What's cooking in git.git (Jan 2019, #03; Fri, 18) Junio C Hamano
2019-01-19 1:13 ` Elijah Newren [this message]
2019-01-19 17:50 ` Junio C Hamano
2019-01-21 15:33 ` Johannes Schindelin
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=CABPp-BFmYoeiOaB9Pf70TC3XftXjMEHGrPqxS8TgiiXR39q2rQ@mail.gmail.com \
--to=newren@gmail.com \
--cc=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.
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).