From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 05 Dec 2020 18:16:52 GMT
Subject: Re: [PATCH] experiment: pull: change --ff-only and default mode
Message-ID: <CAMP44s12DENe7KcSxzRAL_u0YZV10o_okzm5fKkjz0W59NrATA@mail.gmail.com>
In-Reply-To: <CABPp-BE7B5hn3Fc4zD1o+qoqihJqCut=R1TP_fxMXW42+6iL+w@mail.gmail.com>

On Sat, Dec 5, 2020 at 11:29 AM Elijah Newren <newren@gmail.com> wrote:
>
> On Fri, Dec 4, 2020 at 8:06 PM Felipe Contreras
> <felipe.contreras@gmail.com> wrote:
>
> This commit message should say something more than just "change x", it
> should have some words about what it is change from or to.  I think
> the thrust of the patch is allowing --ff-only, --merge, and --rebase
> to countermand an earlier otherwise-conflicting option.  Perhaps a
> commit message of the form:

It's not a real commit, it's just a preview at what the eventual
diffstat towards v3 might look like.

-- 
Felipe Contreras