git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>,
	Git Mailing List <git@vger.kernel.org>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>
Subject: Re: What's cooking in git.git (Feb 2020, #04; Mon, 17)
Date: Sat, 22 Feb 2020 09:16:56 -0800	[thread overview]
Message-ID: <xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BE_ktNmDB43N_qijzYzhXvsK8Fi7TJQ7goHu+MzGvdpBQ@mail.gmail.com> (Elijah Newren's message of "Fri, 21 Feb 2020 19:03:04 -0800")

Elijah Newren <newren@gmail.com> writes:

>> > [Stalled]
>> >
>> > * pw/advise-rebase-skip (2019-12-06) 9 commits
>> >   - rebase -i: leave CHERRY_PICK_HEAD when there are conflicts
>> >   - rebase: fix advice when a fixup creates an empty commit
>> > ...
>> The tip "rebase -i: leave CHERRY_PICK_HEAD when there are conflicts"
>> needs reworking and can be dropped (cf
>> <7e1b92f5-48df-e202-ebcc-5b15987a7d63@gmail.com>). The other RFC patch
>> "rebase: fix advice when a fixup creates an empty commit" [1] could do
>> with someone commenting on it (I've Cc'd dscho and Elijah). I think the
>
> I'll try to take a look early to middle of next week.

Thanks, both.  I think the early ones except for those two make
sense by themselves, so perhaps I'll advance them to 'next'
independently of these two steps.


  reply	other threads:[~2020-02-22 17:17 UTC|newest]

Thread overview: 14+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-17 22:08 What's cooking in git.git (Feb 2020, #04; Mon, 17) Junio C Hamano
2020-02-18  3:30 ` Elijah Newren
2020-02-18 16:00   ` en/rebase-backend, was " Johannes Schindelin
2020-02-26 10:34     ` Alban Gruin
2020-02-22  3:11   ` Elijah Newren
2020-02-22 17:18     ` Junio C Hamano
2020-02-19 19:58 ` Taylor Blau
2020-02-19 20:50   ` Eric Sunshine
2020-02-19 21:51   ` Junio C Hamano
2020-02-19 22:07     ` Taylor Blau
2020-02-21 16:26 ` Phillip Wood
2020-02-22  3:03   ` Elijah Newren
2020-02-22 17:16     ` Junio C Hamano [this message]
2020-02-26 20:04     ` Elijah Newren

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=xmqq7e0e7d9z.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    /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).