Thread (6 messages) 6 messages, 3 authors, 2020-12-02

Re: [RFC 2/2] pull: default pull.ff to "only" when pull.rebase is not set either

From: Felipe Contreras <hidden>
Date: 2020-11-25 03:48:09

On Tue, Nov 24, 2020 at 9:45 PM Felipe Contreras
[off-list ref] wrote:
On Tue, Nov 24, 2020 at 8:14 PM Alex Henrie [off-list ref] wrote:

Before making this the default we need a solution *right now* that is
a sane default.
This mail was sent by mistake. I was going to say:

We need a warning like:

  The pull was not fast-forward, please either merge or rebase.

When the default (pull.ff=only) is set.

It is the current status that is more urgent to fix.

-- 
Felipe Contreras
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help