[plt-dev] Re: [plt] Push #20178: master branch updated

On May 10, Carl Eastlund wrote:
> Yeah, sorry, I realized as soon as the "git push" reported 2 commits
> that I should have rebased, but by then it was too late.

FWIW, that alias that I mentioned in the previous email (the
  up = pull --ff-only --stat --all
thing) is probably useful here too.  It would have refused to do
either a merge or a rebase if there were updates, and then you can
decide on what's more appropriate.

-- 
          ((lambda (x) (x x)) (lambda (x) (x x)))          Eli Barzilay:
                    http://barzilay.org/                   Maze is Life!