Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1573229

Fail git pull --rebase when local merges present? (was: [ANNOUNCE] Git v2.11.1)

Show all headers | View 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

Back to linux.kernel | Previous | Next | Find similar | Unroll thread

Thread

Fail git pull --rebase when local merges present? (was: [ANNOUNCE]  Git v2.11.1) Stephen Bash <bash@genarts.com> - 2017-02-03 17:10 +0100

csiph-web