From: Felipe Contreras <felipe.contreras@gmail.com>
Date: Sat, 12 Dec 2020 00:43:32 GMT
Subject: Re: fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)
Message-ID: <CAMP44s2Hj7HbuyfkHfMUQiW-yS1W_xfS0JKGiEt5nxcJx1TKkw@mail.gmail.com>
In-Reply-To: <20201211220938.GB575698@mit.edu>

On Fri, Dec 11, 2020 at 4:09 PM Theodore Y. Ts'o <tytso@mit.edu> wrote:

> So if we think it is going to make things better going forward, I for
> one am very willing to deal with any short-term pain associated with
> changes here.

My proposal is that eventually:

  git pull --no-rebase -> git pull --merge
  git pull --ff-only -> git pull

I think that would even be easier on the fingers for you.

-- 
Felipe Contreras