From: "Theodore Y. Ts'o" <tytso@mit.edu>
To: Junio C Hamano <gitster@pobox.com>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>,
git@vger.kernel.org, Emily Shaffer <emilyshaffer@google.com>,
Felipe Contreras <felipe.contreras@gmail.com>
Subject: Re: fc/pull-merge-rebase, was Re: What's cooking in git.git (Dec 2020, #01; Tue, 8)
Date: Thu, 10 Dec 2020 10:27:15 -0500 [thread overview]
Message-ID: <20201210152715.GQ52960@mit.edu> (raw)
In-Reply-To: <xmqqk0tq1xf3.fsf@gitster.c.googlers.com>
On Wed, Dec 09, 2020 at 01:28:48PM -0800, Junio C Hamano wrote:
>
> A spot check: do you have pull.rebase set to anything in your
> config?
FWIW, I haven't set pull.rebase to anything, but what I have done is
to simply added --ff-only or --rebase to my "git pull" commands. I
type fast, though, so it's not that a big deal, and I like the fact
that the warning is making me explicitly express what it is that I
want to have happen.
It's also true that very often, I end up running "git fetch", then
look at what I got pulled down, and only then run either "git merge"
or "git merge --ff-only" or "git rebase" explicitly.
Cheers,
- Ted
next prev parent reply other threads:[~2020-12-10 15:28 UTC|newest]
Thread overview: 30+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-09 1:31 What's cooking in git.git (Dec 2020, #01; Tue, 8) Junio C Hamano
2020-12-09 1:41 ` Taylor Blau
2020-12-10 2:02 ` Jonathan Tan
2020-12-09 2:45 ` Elijah Newren
2020-12-09 4:22 ` Junio C Hamano
2020-12-09 23:02 ` Taylor Blau
2020-12-10 0:57 ` Junio C Hamano
2020-12-10 2:57 ` Jonathan Tan
2020-12-09 14:09 ` fc/pull-merge-rebase, was " Johannes Schindelin
2020-12-09 21:28 ` Junio C Hamano
2020-12-10 0:31 ` Felipe Contreras
2020-12-10 4:40 ` Johannes Schindelin
2020-12-10 4:46 ` Johannes Schindelin
2020-12-10 15:11 ` Felipe Contreras
2020-12-10 15:27 ` Theodore Y. Ts'o [this message]
2020-12-10 18:28 ` Junio C Hamano
2020-12-11 1:33 ` Felipe Contreras
2020-12-11 7:17 ` Junio C Hamano
2020-12-11 14:10 ` Felipe Contreras
2020-12-11 22:09 ` Theodore Y. Ts'o
2020-12-12 0:43 ` Felipe Contreras
2020-12-10 0:27 ` Felipe Contreras
2020-12-11 5:59 ` Junio C Hamano
2020-12-09 14:11 ` js/init-defaultbranch-advice, " Johannes Schindelin
2020-12-09 21:57 ` Junio C Hamano
2020-12-10 4:54 ` Johannes Schindelin
2020-12-10 18:33 ` Junio C Hamano
2020-12-11 0:03 ` Felipe Contreras
2020-12-10 3:56 ` bc/rev-parse-path-format, " Johannes Schindelin
2020-12-10 18:34 ` Junio C Hamano
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=20201210152715.GQ52960@mit.edu \
--to=tytso@mit.edu \
--cc=Johannes.Schindelin@gmx.de \
--cc=emilyshaffer@google.com \
--cc=felipe.contreras@gmail.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.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 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 NNTP newsgroup(s).