{"thread":{"id":"45035","subject":"Fail git pull --rebase when local merges present? (was: [ANNOUNCE] Git v2.11.1)","startedAt":"2017-02-03T16:02:19Z","lastAt":"2017-02-03T16:02:19Z","messageCount":1,"participants":["Stephen Bash"],"isPatch":false,"patchVersion":null,"patchTotal":null},"messages":[{"id":"310807","messageId":"CAAyCa8k4zfv7thRsX+5M8TGQ+2U3nfj_tTN_pZPe8jQb6mPJrQ@mail.gmail.com","threadId":"45035","inReplyTo":null,"subject":"Fail git pull --rebase when local merges present? (was: [ANNOUNCE] Git v2.11.1)","fromName":"Stephen Bash","fromEmail":"bash@genarts.com","sentAt":"2017-02-03T16:01:10Z","receivedAt":"2017-02-03T16:02:19Z","isPatch":false,"sender":{"key":"bash@genarts.com","avatar":null},"body":"On Thu, Feb 2, 2017 at 6:05 PM, Junio C Hamano <gitster@pobox.com> wrote:\n\n>  * \"git pull --rebase\", when there is no new commits on our side since\n>    we forked from the upstream, should be able to fast-forward without\n>    invoking \"git rebase\", but it didn't.\n\nAs someone who has to mentor new developers to Git at my $dayjob, this\nis really nice!  Thanks!\n\nSlightly related (in that it's a pitfall of *always* using pull\n--rebase), does anyone know if there is a way to make git pull\n--rebase fail if there's a local merge?  For our workflow I'd like to\ntell new people to just default to pull --rebase, but having to add\n(and explain) the \"don't rebase a merge\" caveat tends to lose them...\n(yes we mix merge and rebase; it works for us... most of the time)\n\nThanks,\nStephen\n"}]}