Daniel Stenberg wrote:
> 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

Thank you both: I'll try it before my next push !

Regards,
Patrick
-------------------------------------------------------------------
List admin: http://cool.haxx.se/list/listinfo/curl-library
Etiquette: http://curl.haxx.se/mail/etiquette.html
Received on 2010-04-19