All of lore.kernel.org
 help / color / mirror / Atom feed
From: Felipe Contreras <felipe.contreras@gmail.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: "Vít Ondruch" <vondruch@redhat.com>, Git <git@vger.kernel.org>
Subject: Re: Pick the right default and stop warn on `git pull`
Date: Mon, 23 Nov 2020 13:37:33 -0600	[thread overview]
Message-ID: <CAMP44s2H6ubW47RCEs4B4qafpU8Z4Z9Ue3BaAMB-T_pEcxkXig@mail.gmail.com> (raw)
In-Reply-To: <xmqqh7pfopki.fsf@gitster.c.googlers.com>

On Mon, Nov 23, 2020 at 1:15 PM Junio C Hamano <gitster@pobox.com> wrote:
> Vít Ondruch <vondruch@redhat.com> writes:

> > While I understand that the merge after `git pull` is probably not the
> > best strategy (as explained in [1]), asking people to change their
> > configuration to choose their default strategy with every `git pull`
> > is not any better.
>
> There is no clear "default that would suit everybody".

This is a false dichotomy.

Yes, there's no default that would suit everybody, but there is a
better default than the current one:

fast-forward-only:

https://lore.kernel.org/git/1398988808-29678-1-git-send-email-felipe.contreras@gmail.com/

-- 
Felipe Contreras

  reply	other threads:[~2020-11-23 19:38 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
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 [this message]
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=CAMP44s2H6ubW47RCEs4B4qafpU8Z4Z9Ue3BaAMB-T_pEcxkXig@mail.gmail.com \
    --to=felipe.contreras@gmail.com \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.