diff --git a/config.sh b/config.sh
index 714081b..9b537f5 100755
--- a/config.sh
+++ b/config.sh
@@ -13,3 +13,7 @@ ln -s ~/Repositories/config/screenrc .screenrc
 rm -f .vimrc
 ln -s ~/Repositories/config/vimrc .vimrc
 
+# set up the default branch for git
+git config --global branch.master.remote origin
+git config --global branch.master.merge refs/heads/master
+