* Fail git pull --rebase when local merges present? (was: [ANNOUNCE] Git v2.11.1)
@ 2017-02-03 16:01 Stephen Bash
0 siblings, 0 replies; only message in thread
From: Stephen Bash @ 2017-02-03 16:01 UTC (permalink / raw)
To: Junio C Hamano; +Cc: git, Linux Kernel
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
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2017-02-03 16:01 UTC | newest]
Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-03 16:01 Fail git pull --rebase when local merges present? (was: [ANNOUNCE] Git v2.11.1) Stephen Bash
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).