*nix dotfile heaven with git + post-merge hook

I've horsed around with managing my dotfiles using svn and git but never took a really systematic approach before. Now I've seen the light! I introduce to you git-dotfiles.

IMG_4148
The goose that laid the golden egg
Died looking up its crotch
To find out how its sphincter worked
Would you lay well? Don't watch.
--X.J. Kennedy, "Ars Poetica"