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

I think it happens because you work in the ps3mediaserver tree. This makes that the "Pull" command needs to merge the remote commits into your tree, seemingly making it a new commit.

You could experiment by using "Fetch & rebase" instead of "Pull".
This would revert your local changes, then fast forward the tree to the latest commit and finally reapply your local changes on top of that. To the outside world it would appear as if you did your work on the latest source.

There is, of course the chance that this will cause conflicts - the same chance as when you pull.