using git: rebase, not putll before push

[Boudewijn Rempt]

Hi,

We're having lots and lots of 

Merge branch 'master' of ssh://git.kde.org/calligra

type commits. Those are caused by pushing without rebasing first.

So, instead of doing this:


git pull, hack, commit, hack commit, git pull, git push

do:

git pull, hack, commit, hack, commit, git rebase origin master, pit push


-- 
Boudewijn Rempt | http://www.valdyas.org, http://www.krita.org