Re: [PATCH v3 05/12] sequencer: introduce the `merge` command
- From
Johannes Schindelin <johannes.schindelin@gmx.de>
- Date
- Feb 12, 2018, 20:17 UTC
- Message-ID
- <nycvar.QRO.7.76.6.1802122116200.35@ZVAVAG-6OXH6DA.rhebcr.pbec.zvpebfbsg.pbz>
- In-Reply-To
- <CAPig+cRc079RsC9i2S9PisE7pZjVfM8i7rUhbT-t6vupFZUaKQ@mail.gmail.com>
Hi Eric,
On Mon, 12 Feb 2018, Eric Sunshine wrote:
Show 11 quoted lines
> On Sat, Feb 10, 2018 at 7:10 PM, Johannes Schindelin > <johannes.schindelin@gmx.de> wrote: > > 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. > > > > The previous patch implemented the `label` and `reset` commands to label > > commits and to reset to a labeled commits. This patch adds the `merge` > > s/to a/to/
Fixed locally. Will be part of the next iteration, if one is necessary. Otherwise I will first ask Junio whether he can touch up the commit message before applying.
Ciao, Dscho