mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Johannes Schindelin <>
To: Phillip Wood <>
Cc: Git Mailing List <>,
	Junio C Hamano <>
Subject: Re: [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty
Date: Tue, 20 Mar 2018 16:42:05 +0100 (STD)	[thread overview]
Message-ID: <nycvar.QRO.> (raw)
In-Reply-To: <>

Hi Phillip,

On Tue, 20 Mar 2018, Phillip Wood wrote:

> From: Phillip Wood <>
> These patches apply on top of js/rebase-recreate-merge. They extend
> the --keep-empty fix from maint [1] to work with --recreate-merges.

As indicated in another reply, I'd rather rebase the --recreate-merges
patches on top of your --keep-empty patch series. This obviously means
that I would fold essentially all of your 2/2 changes into my
"rebase-helper --make-script: introduce a flag to recreate merges"

The 1/2 (with s/failure/success/g) would then be added to the
--recreate-merges patch series at the end.

Would that be okay with you?


  parent reply	other threads:[~2018-03-20 15:42 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-03-20 10:11 [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty Phillip Wood
2018-03-20 10:11 ` [PATCH 1/2] add failing test for rebase --recreate-merges --keep-empty Phillip Wood
2018-03-20 10:11 ` [PATCH 2/2] rebase --recreate-merges --keep-empty: don't prune empty commits Phillip Wood
2018-03-20 15:38   ` Johannes Schindelin
2018-03-20 15:42 ` Johannes Schindelin [this message]
2018-03-20 18:40   ` [PATCH 0/2] rebase --recreate-merges --keep-empty: don't prune empty Phillip Wood
2018-03-20 19:32     ` Junio C Hamano
2018-03-22 11:03       ` Phillip Wood
2018-03-22 16:48         ` Junio C Hamano

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:

  List information:

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=nycvar.QRO. \ \ \ \ \

* 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

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).