git@vger.kernel.org mailing list mirror (one of many)
 help / color / mirror / code / Atom feed
From: Robert Dailey <rcdailey.lists@gmail.com>
To: Git <git@vger.kernel.org>
Subject: Why does `pull.rebase` default to `false`?
Date: Fri, 28 Feb 2020 12:15:29 -0600	[thread overview]
Message-ID: <CAHd499DC7pOB3kD7nAG79GrufKrV-8p4vSZ5ZEPQb5gdXrNakg@mail.gmail.com> (raw)

This is more of a question of practicality. Literally all of the team
and project workflows I've experienced have demanded that `git pull`
actually perform a rebase of your local commits, as opposed to
introducing a merge commit. This means setting `pull.rebase` to
`true`. I can't think of a practical, day-to-day use case for wanting
merge commits after a pull. Since the subject commits of the rebase
are always local, there's no harm to anything upstream since they
haven't been pushed yet.

I'm sure there are edge cases that explain why the default is `false`,
but I'd argue that it is likely a case of the minority concerns
becoming an inconvenience for the majority of users.

Thanks in advance for any enlightenment!

             reply	other threads:[~2020-02-28 18:15 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-02-28 18:15 Robert Dailey [this message]
2020-02-28 18:54 ` Why does `pull.rebase` default to `false`? 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

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=CAHd499DC7pOB3kD7nAG79GrufKrV-8p4vSZ5ZEPQb5gdXrNakg@mail.gmail.com \
    --to=rcdailey.lists@gmail.com \
    --cc=git@vger.kernel.org \
    /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).