On Mon, Mar 25, 2019 at 7:56 AM Johannes Schindelin
wrote:
>
> Hi C.J.
>
> On Fri, 22 Mar 2019, C.J. Jameson wrote:
>
> > Confirming Sergey's summary: at this point, I think my only residual
> > opinion is that requiring `-m 1` or `--mainline 1` is a little cr
Thank you everyone for the comments!
Confirming Sergey's summary: at this point, I think my only residual
opinion is that requiring `-m 1` or `--mainline 1` is a little cryptic
for someone who's just cherry-picking a single commit, which happens
to be a merge commit. `--no-forbid-merges` would be
On Wed, Mar 20, 2019 at 8:59 AM Sergey Organov wrote:
>
> Elijah Newren writes:
>
> > On Wed, Mar 20, 2019 at 8:09 AM Sergey Organov wrote:
> >>
> >> Junio C Hamano writes:
> >>
> >> [...]
> >>
> >> > But I do have a very strong opinion against adding yet another
> >> > option that takes an opt
>From fbb0e1fef08a2abd7f1620134925788f7a0e011f Mon Sep 17 00:00:00 2001
From: "C.J. Jameson"
Date: Tue, 19 Mar 2019 17:57:31 -0700
Subject: [RFC PATCH] cherry-pick: set default `--mainline` parent to 1
When cherry-picking from a standard merge commit, the parent should
always be 1,
4 matches
Mail list logo
