Merge branch 'master' ??

Michel Dänzer michel at
Tue Nov 14 09:29:49 PST 2006

On Tue, 2006-11-14 at 11:09 -0600, Jeremy C. Reed wrote:
> See the commit email at:
> It has:
>   Merge branch 'master' of git+ssh://
> I don't know what caused that.

You probably ran git-pull (which does more than people tend to expect)
when you already had your change committed locally.

> Is that a problem?

It is a problem (if minor) IMO because it clutters up the revision
history in gitk. It can be avoided using git-fetch and git-rebase
instead of git-pull.

Earthling Michel Dänzer           |
Libre software enthusiast         |          Debian, X and DRI developer

More information about the xorg mailing list