From: Felipe Contreras <felipe.contreras@gmail.com>
To: Philip Oakley <philipoakley@iee.email>
Cc: "Alex Henrie" <alexhenrie24@gmail.com>, Git <git@vger.kernel.org>,
"Junio C Hamano" <gitster@pobox.com>,
"Raymond E. Pasco" <ray@ameretat.dev>,
"Jeff King" <peff@peff.net>, "Vít Ondruch" <vondruch@redhat.com>,
"Theodore Tso" <tytso@mit.edu>
Subject: Re: [RFC 2/2] pull: default pull.ff to "only" when pull.rebase is not set either
Date: Tue, 1 Dec 2020 22:43:48 -0600 [thread overview]
Message-ID: <CAMP44s3Y6SxvxEH8snUi6LKTOmnuNOt7x1XSn2p5_zPQb0Ez2w@mail.gmail.com> (raw)
In-Reply-To: <67e55d85-63a4-9a47-e633-52b2ece23758@iee.email>
On Wed, Nov 25, 2020 at 7:25 AM Philip Oakley <philipoakley@iee.email> wrote:
>
> On 25/11/2020 03:47, Felipe Contreras wrote:
> > On Tue, Nov 24, 2020 at 9:45 PM Felipe Contreras
> > <felipe.contreras@gmail.com> wrote:
> >> On Tue, Nov 24, 2020 at 8:14 PM Alex Henrie <alexhenrie24@gmail.com> 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.
> >
>
> Maybe this could also, as an interim measure, be a doc change right in
> the first paragraph of the `git pull --help` description section to warn
> that its current default may not be suitable for most users, and to see
> the `--ff-only` option (and variants) and its matching config variable.
>
> e.g. "In its default mode, git pull uses the --ff option and is
> shorthand for git fetch followed by git merge FETCH_HEAD. The --ff-only
> option may be more suitable for modern usage. It can be set using `git
> config pull.ff only`."
> (then once v3.0 arrives the discussion can be flipped)
>
> It's worth making sure that the manuals are easy to read.
This is what my patch attempted to do:
https://lore.kernel.org/git/20201125032938.786393-11-felipe.contreras@gmail.com/
Before warning that a non-fast-forward pull failed, it's probably
sensible to explain what a fast-forward is.
--
Felipe Contreras
next prev parent reply other threads:[~2020-12-02 4:45 UTC|newest]
Thread overview: 18+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-25 2:09 [RFC 1/2] pull: warn that pulling will not merge by default in Git 3.0 Alex Henrie
2020-11-25 2:09 ` [RFC 2/2] pull: default pull.ff to "only" when pull.rebase is not set either Alex Henrie
2020-11-25 3:45 ` Felipe Contreras
2020-11-25 3:47 ` Felipe Contreras
2020-11-25 13:25 ` Philip Oakley
2020-12-02 4:43 ` Felipe Contreras [this message]
2020-12-03 2:21 ` Junio C Hamano
2020-12-03 9:07 ` Felipe Contreras
2020-12-03 18:06 ` Junio C Hamano
2020-12-03 19:29 ` Junio C Hamano
2020-12-03 23:05 ` Felipe Contreras
2020-12-04 0:53 ` Jacob Keller
2020-12-04 2:06 ` Junio C Hamano
2020-12-04 6:37 ` Felipe Contreras
2020-12-04 19:37 ` Junio C Hamano
2020-12-04 21:11 ` Felipe Contreras
2020-12-11 20:38 ` Alex Henrie
2020-12-12 1:08 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=CAMP44s3Y6SxvxEH8snUi6LKTOmnuNOt7x1XSn2p5_zPQb0Ez2w@mail.gmail.com \
--to=felipe.contreras@gmail.com \
--cc=alexhenrie24@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=peff@peff.net \
--cc=philipoakley@iee.email \
--cc=ray@ameretat.dev \
--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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).