I saw that the OP already replied, but wanted to share how I approach this myself. I have a desktop, laptop, and phone that I wanted to keep synced up, so I actually used it as an excuse to setup my own git repo on my NAS (which I wanted to do anyway).

The only tricky part has been dealing with git on iOS. I have to use a particular app (Working Copy) and some shortcuts to get the syncing behavior consistent. But it is doable!