On Wed, 9 Jun 2010, Yang Tse wrote:

> It seems 'rebase' should have been used at some point.

It's quite simply so that in our use case (with multiple people pushing to the
same repo), we're better off doing 'git pull --rebase' when we want to fetch
commits from remote. Or if you want to do it fancy, add:

[alias]
    up = pull --rebase

... to your ~/.gitconfig as then you can use 'git up' and save several
valuable keypresses! ;-)

-- 
  / daniel.haxx.se
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette:  http://curl.haxx.se/mail/etiquette.html