On Mon, 19 Apr 2010, Kamil Dudka wrote:

> I guess you need to have your own changes on top of the upstream ones.
> Instead of 'git pull' use the following:
>
> $ git fetch
> $ git rebase origin

Or use

$ git pull --rebase

But note that this version doesn't allow you to have local edits when you
invoke it. Not a big problem for me since I like git stash so much! ;-)

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