From d925dd1e13ecebd59527bfe01888f2d2eb718639 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Fri, 16 Dec 2011 13:56:17 -0500 Subject: [PATCH 1/3] 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 + From e17282e136101f31df77ec3a4443423f06ab9490 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Fri, 16 Dec 2011 13:58:55 -0500 Subject: [PATCH 2/3] Fixed typo in config.sh. --- config.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.sh b/config.sh index 9b537f5..7e859ec 100755 --- a/config.sh +++ b/config.sh @@ -7,7 +7,7 @@ rm -f .bashrc ln -s ~/Repositories/config/profile .profile ln -s ~/Repositories/config/bashrc .bashrc -rm -f .screenrf +rm -f .screenrc ln -s ~/Repositories/config/screenrc .screenrc rm -f .vimrc From dfc11752faaafcdddb3a015ac823bb396ca66104 Mon Sep 17 00:00:00 2001 From: Nicole Tietz-Sokolskaya Date: Fri, 16 Dec 2011 14:33:07 -0500 Subject: [PATCH 3/3] Added new path. --- profile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/profile b/profile index 24ef63e..0c81a85 100644 --- a/profile +++ b/profile @@ -42,3 +42,6 @@ export HISTCONTROL=ignoredups # disable messaging mesg n +# add the rubygem location +export PATH=$PATH:/var/lib/gems/1.8/bin/ +