All of lore.kernel.org
 help / color / mirror / Atom feed
From: Junio C Hamano <gitster@pobox.com>
To: Elijah Newren <newren@gmail.com>
Cc: Phillip Wood <phillip.wood@dunelm.org.uk>,
	Johannes Schindelin <Johannes.Schindelin@gmx.de>,
	Git Mailing List <git@vger.kernel.org>,
	Eric Sunshine <sunshine@sunshineco.com>, ch <cr@onlinehome.de>
Subject: Re: [PATCH v3] sequencer: do not squash 'reword' commits when we hit conflicts
Date: Tue, 19 Jun 2018 09:59:15 -0700	[thread overview]
Message-ID: <xmqqsh5ivhjw.fsf@gitster-ct.c.googlers.com> (raw)
In-Reply-To: <CABPp-BHFuqh1KVPod+chZD=AKGVBd_apOt6F9oTaZ0ZA66G03Q@mail.gmail.com> (Elijah Newren's message of "Tue, 19 Jun 2018 07:29:12 -0700")

Elijah Newren <newren@gmail.com> writes:

> [As an aside, I know there are multiple other outstanding emails for
> me to respond to, unrelated to this patch.  I'll try to get some time
> in the next day or two to respond.  Just responding to this one since
> Junio mentioned picking it up for 2.18.]

Thanks for a reminder.

I thought I said that I'll backburner/ignore the topic and expect
something that can be picked up to be there when I come back after I
cut 2.18 final, but I ended up coming back to read the topic anyway
it seems ;-)


  reply	other threads:[~2018-06-19 16:59 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-11 16:06 [BUG] git-rebase: reword squashes commits in case of merge-conflicts ch
2018-06-12 10:08 ` Jeff King
2018-06-15 14:35   ` ch
2018-06-16 16:08 ` Elijah Newren
2018-06-17  3:36   ` Eric Sunshine
2018-06-17  5:37     ` [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts Elijah Newren
2018-06-17 15:04       ` Phillip Wood
2018-06-17 19:28         ` Johannes Schindelin
2018-06-18 10:20           ` Phillip Wood
2018-06-18 15:42             ` Junio C Hamano
2018-06-18 21:42             ` Johannes Schindelin
2018-06-19 10:00               ` [PATCH v2] sequencer: do not squash 'reword' commits when wehit conflicts Phillip Wood
2018-06-19 12:46               ` [PATCH v3] sequencer: do not squash 'reword' commits when we hit conflicts Phillip Wood
2018-06-19 14:29                 ` Elijah Newren
2018-06-19 16:59                   ` Junio C Hamano [this message]
2018-08-23 10:09                 ` [PATCH] t/lib-rebase.sh: support explicit 'pick' commands in 'fake_editor.sh' SZEDER Gábor
2018-08-23 16:20                   ` Junio C Hamano
2018-08-23 20:53                   ` Johannes Schindelin
2018-06-17 18:46       ` [PATCH v2] sequencer: do not squash 'reword' commits when we hit conflicts 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=xmqqsh5ivhjw.fsf@gitster-ct.c.googlers.com \
    --to=gitster@pobox.com \
    --cc=Johannes.Schindelin@gmx.de \
    --cc=cr@onlinehome.de \
    --cc=git@vger.kernel.org \
    --cc=newren@gmail.com \
    --cc=phillip.wood@dunelm.org.uk \
    --cc=sunshine@sunshineco.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.