From: Alex Henrie <alexhenrie24@gmail.com>
To: Felipe Contreras <felipe.contreras@gmail.com>
Cc: "Jeff King" <peff@peff.net>, "Junio C Hamano" <gitster@pobox.com>,
"Theodore Y. Ts'o" <tytso@mit.edu>,
"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: Tue, 24 Nov 2020 16:23:49 -0700 [thread overview]
Message-ID: <CAMMLpeQvofhPjcJ19JrqJs1W3YoQSP+hOainuZJa=QeJzYc+5w@mail.gmail.com> (raw)
In-Reply-To: <CAMP44s2z3vv2LwoMesydVL3qWrJh0VvHSUy+FpnqguoipRRD9g@mail.gmail.com>
On Tue, Nov 24, 2020 at 3:11 PM Felipe Contreras
<felipe.contreras@gmail.com> wrote:
>
> Before making "pull.ff=only" the default, we need a transitional
> period in which if it's unset, a warning is printed when pulling a
> non-fast-forward branch. This is what my patch did several years ago.
We'd only need a warning if both pull.ff and pull.rebase are unset,
since that's the only situation where the behavior would change. And
providentially, we already have a warning in that exact case, although
we should probably tweak it to explain what the new behavior is going
to be :-)
> And yes, it should be possible to do what you suggest, but have you
> tried? I suspect both the code and the documentation would be quite
> convoluted.
Yes, I have written a very simple patch that implements the behavior
that I am suggesting. I will send it to the mailing list later
tonight.
-Alex
next prev parent reply other threads:[~2020-11-24 23: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
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 [this message]
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='CAMMLpeQvofhPjcJ19JrqJs1W3YoQSP+hOainuZJa=QeJzYc+5w@mail.gmail.com' \
--to=alexhenrie24@gmail.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--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 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.