git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Alex Henrie <alexhenrie24@gmail.com>
To: Robert Dailey <rcdailey.lists@gmail.com>
Cc: Konstantin Tokarev <annulen@yandex.ru>,
	Junio C Hamano <gitster@pobox.com>,
	Elijah Newren <newren@gmail.com>, Git <git@vger.kernel.org>
Subject: Re: Why does `pull.rebase` default to `false`?
Date: Fri, 28 Feb 2020 14:53:12 -0700	[thread overview]
Message-ID: <CAMMLpeTheUdUx0GZL2pQybewkPM2d-NB1-zvV9qu=VOzrMiddg@mail.gmail.com> (raw)
In-Reply-To: <CAHd499B3HbXPo+O3u3qA-SfJ_dV=z2k5v09mVHtbjXGkAaNBvQ@mail.gmail.com>

On Fri, Feb 28, 2020 at 2:23 PM Robert Dailey <rcdailey.lists@gmail.com> wrote:
>
> So the problem statement is: Prevent newbies from doing a merge commit
> on pull. Whether its a rebase or not is beside the point. I think
> making it --ff-only would solve the issue nicely. It forces them to
> make their intention explicit: Ether do a merge pull, or a rebase
> pull. But you are forcing them to pick (and ultimately get educated).

I actually wrote a patch that prints a warning on `git pull` if the
user has not set pull.rebase in their config file or specified
--rebase, --no-rebase, or --ff-only on the command line, but I haven't
submitted it because I figured that it would start a big argument on
the mailing list. Since that argument has now already started, I
should probably just send the patch.

-Alex

      parent reply	other threads:[~2020-02-28 21:53 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-28 18:15 Why does `pull.rebase` default to `false`? Robert Dailey
2020-02-28 18:54 ` Randall S. Becker
2020-02-28 18:56 ` Elijah Newren
2020-02-28 20:17   ` Junio C Hamano
2020-02-28 21:10     ` Konstantin Tokarev
2020-02-28 21:22       ` Robert Dailey
2020-02-28 21:46         ` Konstantin Tokarev
2020-02-28 21:53         ` Alex Henrie [this message]

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='CAMMLpeTheUdUx0GZL2pQybewkPM2d-NB1-zvV9qu=VOzrMiddg@mail.gmail.com' \
    --to=alexhenrie24@gmail.com \
    --cc=annulen@yandex.ru \
    --cc=git@vger.kernel.org \
    --cc=gitster@pobox.com \
    --cc=newren@gmail.com \
    --cc=rcdailey.lists@gmail.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).