Permalink
Browse files

Merge branch 'master' of github.com:dcramer/dotfiles

  • Loading branch information...
2 parents 5ec1a97 + 14b34a7 commit c9f5f0a9d62f29d6687c3e8fbb7e1c115b1853fd @dcramer committed Apr 30, 2012
Showing with 1 addition and 6 deletions.
  1. +1 −2 Makefile
  2. +0 −4 bash/bashrc
View
3 Makefile
@@ -6,7 +6,6 @@ install-bin:
ln -fs `pwd`/bin/* ~/bin/
install-bash:
- cp ~/.bash_profile ~/.bash_profile.old
ln -fs `pwd`/bash/bashrc ~/.bash_profile
ln -fs ~/.bash_profile ~/.bashrc
@echo "Old .bash_profile saved as .bash_profile.old"
@@ -21,4 +20,4 @@ install-pythonrc:
install-subl:
ifeq ($(shell uname),Darwin)
sudo ln -fs "/Applications/Sublime Text 2.app/Contents/SharedSupport/bin/subl" /usr/local/bin/subl
-endif
+endif
View
4 bash/bashrc
@@ -168,10 +168,6 @@ alias scpresume='rsync --partial --progress --progress --stats'
alias vag='vagrant $@'
-if [ -n `which hub` ]; then
- alias git='hub'
-fi
-
function pyopen() {
$PYOPEN_CMD `pyfind $@`
}

0 comments on commit c9f5f0a

Please sign in to comment.