merge original .gitconfig from forked dotfiles with my own