It's time to stop using merge commits. Disable them (and squashes) and just fast-forward all your commits!
Yet another article on the internet about how to reasonably manage multiple git personas
A pretty few lines of git magic to fast-forward a git clone without a full git pull