For dotfiles, a good workflow seem to have a git/hg repo and combine it with GNU stow.

http://brandon.invergo.net/news/2012-05-26-using-gnu-stow-to...