Comment by Ferret7446

That's what branches are for. I have two personal machines and two work machines, all of which have diverging configs, which I push to two remotes (one work specific), and I merge changes between them.

This is how Git was designed to be used.