On Mon April 19 2010 18:06:36 Patrick Monnerat wrote: > I keep a local working copy of curl and make update on it. > After commit (local), I have to push to the github server. > If someone made pushes in the meantime, github rejects my push: some > refs cannot be pushed (non fast-forward rejected). > Thus I have to pull before push. > This works fine, but the pull leaves an inelegant track on the github > server and on the http://curl.haxx.se/auto/cvshistory.html page: > > Merge branch 'master' of github.com:bagder/curl > > How to avoid it ? You should all know the trick since it seems I'm the > only one with this problem !
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 Kamil ------------------------------------------------------------------- List admin: http://cool.haxx.se/list/listinfo/curl-library Etiquette: http://curl.haxx.se/mail/etiquette.html
