diff --git a/git/gitignore b/git/gitignore index 62b1439..0dcbe49 100644 --- a/git/gitignore +++ b/git/gitignore @@ -1,5 +1,4 @@ .DS_Store .bundle .rake_tasks -*.sublime-project -*.sublime-workspace +*.sublime-* diff --git a/zsh/aliases.zsh b/zsh/aliases.zsh index 140078c..8060583 100644 --- a/zsh/aliases.zsh +++ b/zsh/aliases.zsh @@ -1,13 +1,20 @@ -alias reload!='. ~/.zshrc' -alias b='bundle exec' -alias please='sudo' -alias mkbundle='bundle install --path .bundle' +alias reload!=". ~/.zshrc" +alias please="sudo" + +# Ruby & Rails +alias b="bundle exec" +alias mkbundle="bundle install --path .bundle" +alias ss="git up && bundle && bundle exec rake db:migrate" +alias rc="bundle exec rails c" +alias rs="bundle exec rails s" # Git -alias glog="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative" +alias gl="git log --graph --pretty=format:'%Cred%h%Creset %an: %s - %Creset %C(yellow)%d%Creset %Cgreen(%cr)%Creset' --abbrev-commit --date=relative" alias gc="git commit -m" alias ga="git add -u && git add . && git st" alias gs="git st" +alias gd="git diff" +alias gp="git push" # Services start-ups and shut-downs diff --git a/zsh/paths.zsh b/zsh/paths.zsh index 3d917e3..87b30a2 100644 --- a/zsh/paths.zsh +++ b/zsh/paths.zsh @@ -1,3 +1,3 @@ export PATH=~/.dotfiles/bin:$PATH export PATH=~/.apps/tunneler/bin:$PATH -export PATH=/Applications/Sublime\ Text\ 2.app/Contents/SharedSupport/bin:$PATH +export PATH=/Applications/Sublime\ Text\ 3.app/Contents/SharedSupport/bin:$PATH