From: Eric Sunshine <sunshine@sunshineco.com>
Date: Fri, 20 Apr 2018 05:38:32 GMT
Subject: Re: [PATCH v7 07/17] # This is a combination of 2 commits. # This is the 1st commit message:
Message-ID: <CAPig+cRrS0_nYJJY=O6cboV630sNQHPV5QGrQdD8MW-sYzNFGQ@mail.gmail.com>
In-Reply-To: <f3d13a304aa8586dd49a19947f09c00966590340.1524139900.git.johannes.schindelin@gmx.de>

On Thu, Apr 19, 2018 at 8:20 AM, Johannes Schindelin
<johannes.schindelin@gmx.de> wrote:
> # This is a combination of 2 commits. # This is the 1st commit message:

Botched squash/fixup?

> sequencer: introduce the `merge` command
>
> This patch is part of the effort to reimplement `--preserve-merges` with
> a substantially improved design, a design that has been developed in the
> Git for Windows project to maintain the dozens of Windows-specific patch
> series on top of upstream Git.
> [...]
> Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de>
>
> # The commit message #2 will be skipped:
>
> # fixup! sequencer: introduce the `merge` command

Bloop.