I have chosen the following approach to handle dotfiles: 1. `git init` 2. add * into .gitignore 3. `git add -f` dotfile The rest is normal git.

I have chosen the following approach to handle dotfiles: 1. `git init` 2. add * into .gitignore 3. `git add -f` dotfile The rest is normal git. If a dotfile differs by computer, differences live in their own branches and are regulary rebased on the common branch.