git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Jeff King <peff@peff.net>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: "Theodore Y. Ts'o" <tytso@mit.edu>,
	"Alex Henrie" <alexhenrie24@gmail.com>,
	"Vít Ondruch" <vondruch@redhat.com>,
	"Git mailing list" <git@vger.kernel.org>
Subject: Re: Pick the right default and stop warn on `git pull`
Date: Mon, 23 Nov 2020 20:23:47 -0500	[thread overview]
Message-ID: <X7xgow4pchnhf2iY@coredump.intra.peff.net> (raw)
In-Reply-To: <CAMP44s1Z4tDXO4jstGMtYVOYzkQQnZMHp45pYPOimk+=jwFHcw@mail.gmail.com>

On Mon, Nov 23, 2020 at 06:57:17PM -0600, Felipe Contreras wrote:

> > > 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

  reply	other threads:[~2020-11-24  1:24 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-11-23 15:13 Pick the right default and stop warn on `git pull` Vít Ondruch
2020-11-23 17:59 ` Alex Henrie
2020-11-23 19:13   ` Theodore Y. Ts'o
2020-11-23 19:40     ` Felipe Contreras
2020-11-23 20:20       ` Theodore Y. Ts'o
2020-11-23 20:34         ` Felipe Contreras
2020-11-23 21:48           ` Jeff King
2020-11-23 22:03             ` Alex Henrie
2020-11-24  0:37               ` Jeff King
2020-11-23 22:39             ` Junio C Hamano
2020-11-23 22:55             ` Felipe Contreras
2020-11-24  0:39               ` Jeff King
2020-11-24  0:57                 ` Felipe Contreras
2020-11-24  1:23                   ` Jeff King [this message]
2020-11-24  2:18                     ` Junio C Hamano
2020-11-24  2:32                       ` Jeff King
2020-11-24  3:41                         ` Felipe Contreras
2020-11-24  7:19                           ` Jeff King
2020-11-24  7:48                             ` Felipe Contreras
2020-11-24  8:07                               ` Jeff King
2020-11-24 10:35                           ` Vít Ondruch
2020-11-24 20:21                           ` Alex Henrie
2020-11-24 22:11                             ` Felipe Contreras
2020-11-24 23:23                               ` Alex Henrie
2020-11-25  0:39                                 ` Junio C Hamano
2020-11-26  1:02                                   ` Felipe Contreras
2020-11-23 19:12 ` Junio C Hamano
2020-11-23 19:37   ` Felipe Contreras
2020-11-23 19:43 ` Felipe Contreras

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=X7xgow4pchnhf2iY@coredump.intra.peff.net \
    --to=peff@peff.net \
    --cc=alexhenrie24@gmail.com \
    --cc=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=tytso@mit.edu \
    --cc=vondruch@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body. 
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).