Maybe etckeeper fits your use case? It's specifically built for managing /etc files with version control systems. I can't say much about it since I've never used it, though.
I'm replying here because I think yours is the right answer (etckeeper), but for other readers I want to note that for Arch Linux in particular, an alternative is aconfmgr.