From: Stephen Bash <bash@genarts.com>
To: Junio C Hamano <gitster@pobox.com>
Cc: git@vger.kernel.org, Linux Kernel <linux-kernel@vger.kernel.org>
Subject: Fail git pull --rebase when local merges present? (was: [ANNOUNCE] Git v2.11.1)
Date: Fri, 3 Feb 2017 11:01:10 -0500 [thread overview]
Message-ID: <CAAyCa8k4zfv7thRsX+5M8TGQ+2U3nfj_tTN_pZPe8jQb6mPJrQ@mail.gmail.com> (raw)
On Thu, Feb 2, 2017 at 6:05 PM, Junio C Hamano <gitster@pobox.com> wrote:
> * "git pull --rebase", when there is no new commits on our side since
> we forked from the upstream, should be able to fast-forward without
> invoking "git rebase", but it didn't.
As someone who has to mentor new developers to Git at my $dayjob, this
is really nice! Thanks!
Slightly related (in that it's a pitfall of *always* using pull
--rebase), does anyone know if there is a way to make git pull
--rebase fail if there's a local merge? For our workflow I'd like to
tell new people to just default to pull --rebase, but having to add
(and explain) the "don't rebase a merge" caveat tends to lose them...
(yes we mix merge and rebase; it works for us... most of the time)
Thanks,
Stephen
reply other threads:[~2017-02-03 16:02 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=CAAyCa8k4zfv7thRsX+5M8TGQ+2U3nfj_tTN_pZPe8jQb6mPJrQ@mail.gmail.com \
--to=bash@genarts.com \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=linux-kernel@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.
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).