Merge branch 'master' of github.com:ntietz/config

Conflicts:
	config.sh
	profile
This commit is contained in:
Nicole Tietz-Sokolskaya 2014-09-25 23:19:55 -04:00
commit 10798e31c6
3 changed files with 4 additions and 16 deletions

View file

@ -4,14 +4,14 @@ cd ~
rm -f .profile rm -f .profile
rm -f .bashrc rm -f .bashrc
ln -s ~/Repositories/config/profile .profile ln -s ~/Code/config/profile .profile
ln -s ~/Repositories/config/bashrc .bashrc ln -s ~/Code/config/bashrc .bashrc
rm -f .screenrc rm -f .screenrc
ln -s ~/Repositories/config/screenrc .screenrc ln -s ~/Code/config/screenrc .screenrc
rm -f .vimrc rm -f .vimrc
ln -s ~/Repositories/config/vimrc .vimrc ln -s ~/Code/config/vimrc .vimrc
# set up the default branch for git # set up the default branch for git
git config --global branch.master.remote origin git config --global branch.master.remote origin

View file

@ -89,6 +89,5 @@ macos_magic_fix() {
export PATH=$PATH:~/.bin export PATH=$PATH:~/.bin
ulimit -n 65535
export HISTCONTROL=ignorespace export HISTCONTROL=ignorespace

11
push.sh
View file

@ -1,11 +0,0 @@
#!/bin/bash
places="nicholas@ntietz.com ntietz@neptune.cs.kent.edu ntietz@acm.cs.kent.edu"
for each in $places
do
echo "Updating on $each..."
ssh $each "cd ~/Repositories/config; git pull"
echo "Done."
done