ps3mediaserver/ps3mediaserver — comment on commit f23755b86aeb9aa7b15e784a142b7b1c57c4b060
File:  line 0
By Raptor399:

I think the [network graph](https://github.com/ps3mediaserver/ps3mediaserver/network) explains what happened.
If I read it correctly:

- chocolateboy's original commit was done on March 4th
- there were other commits to the master on March 5th
- chocolateboy merged these commits on March 6th and committed it.

Git cares about the order of the commits, which is why the the weird effects happen.

Rebasing would indeed roll back your own commits, fastforward to the latest revision and then replay your commits on top of it, avoiding the whole thing. I believe TortoiseGit comes with the "fetch + rebase" option to do this automatically.