2006-Dec-08

A few times when doing a git-push, I get:

Merge branch 'master' of git+ssh://git.freedesktop.org/git/xorg/xserver

I was told this was caused by doing a git-pull after doing a commit. And that it causes clutter. It was suggested I use git-fetch and git-rebase instead of git-pull.