From d925dd1e13ecebd59527bfe01888f2d2eb718639 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Fri, 16 Dec 2011 13:56:17 -0500 Subject: [PATCH] Added default branch settings for git. --- config.sh | 4 ++++ 1 file changed, 4 insertions(+) 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 +