Re: Pick the right default and stop warn on `git pull`
- From
Jeff King <peff@peff.net>
- Date
- Nov 24, 2020, 01:23 UTC
- Message-ID
- <X7xgow4pchnhf2iY@coredump.intra.peff.net>
- In-Reply-To
- <CAMP44s1Z4tDXO4jstGMtYVOYzkQQnZMHp45pYPOimk+=jwFHcw@mail.gmail.com>
On Mon, Nov 23, 2020 at 06:57:17PM -0600, Felipe Contreras wrote:
Show 9 quoted lines
> > > But that's not the same thing. The whole point of "pull.mode=ff-only" > > > was to print a message like: > > > > > > The pull was not fast-forward, please either merge or rebase. > > > > Perhaps I don't understand the distinction you are making. I have > > pull.ff=ff set, and I get: > > You mean "pull.ff=only" ?
Er, yeah, sorry.
> > $ git pull > > Try the same thing with "pull.rebase=true".
Ah, that's what I was missing. I agree it would be nice for it to behave consistently in both cases (though why one would set both pull.ff=only and pull.rebase=true, I don't know).
-Peff