On Thu, Apr 19, 2018 at 8:20 AM, Johannes Schindelin <johannes.schinde...@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.schinde...@gmx.de> > > # The commit message #2 will be skipped: > > # fixup! sequencer: introduce the `merge` command Bloop.
