Merge remote-tracking branch 'upstream/master' into autojump-macports2

This commit is contained in:
Christoph Neuroth 2012-07-23 08:25:34 +02:00
commit ab071fb188
5 changed files with 42 additions and 5 deletions

View file

@ -6,7 +6,7 @@ alias bu="bundle update"
# The following is based on https://github.com/gma/bundler-exec
bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rails rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
bundled_commands=(annotate cap capify cucumber foreman guard middleman nanoc rackup rainbows rake rspec ruby shotgun spec spork thin thor unicorn unicorn_rails)
## Functions

View file

@ -29,7 +29,7 @@ alias iminurbase='finger'
alias btw='nice'
alias obtw='nohup'
alias nomz='ps -aux'
alias nomz='ps aux'
alias nomnom='killall'
alias byes='exit'

View file

@ -4,6 +4,6 @@
if [[ $('uname') == 'Linux' ]]; then
alias st='/usr/bin/sublime_text&'
elif [[ $('uname') == 'Darwin' ]]; then
alias st='open -a /Applications/Sublime Text 2.app'
alias st='/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin/subl'
fi
alias stt='st .'