I assume you are using git to manage your home directory. I use gibak[1] for the same(built on top of git). Out of curiosity, what is your setup like?

[1] http://eigenclass.org/hiki/gibak-backup-system-introduction