Aliases and vim-dart

zsh/aliases

@@ -30,7 +30,8 @@ alias bu='bundle update'
 alias cls=clear
 alias code='cd ~/code'
 alias cpr='cp -r'
-alias d='cd ~/.dotfiles'
+alias d='dart'
+alias dot='cd ~/.dotfiles'
 alias dr='cd ~/Dropbox'
 alias duh='du -csh'
 alias functions='vim ~/.dotfiles/zsh/functions'
@@ -42,11 +43,15 @@ alias patch='git format-patch HEAD^ --stdout > patch.diff'
 alias reguard='killall -9 ruby ; guard'
 alias r='rails'
 alias rb='rbenv'
+alias rbp='cd $RBENV_PATH/versions/$(rbenv version | sed -e "s/ (set.*$//")'
+alias rbl='cd $RBENV_PATH/versions/$(rbenv version | sed -e "s/ (set.*$//")/lib/ruby'
 alias rg='rails generate'
 alias rmr='rm -rf'
 alias rc='rails console'
 alias rs='rails server'
 alias reload='source ~/.zshrc'
+alias s='cd ~/.ssh'
+alias sc='vim ~/.ssh/config'
 alias tail-logs='heroku logs -t'
 alias u='cd ..'
 alias v='vim'
@@ -66,47 +71,54 @@ alias amend='git commit --amend'
 alias g='gst'
 alias ga='git add -A :/'
 alias gaa='git add -A'
-alias gae='echo "Use amend!" && git commit --amend' # Remove when not needed
 alias gau='git add --update'
 alias gb='git branch'
 alias gbd='git branch -D'
 alias gc='git commit'
-alias gci='echo "Use gc!" && git commit' # Remove when no longer needed
 alias gcl='git clone'
 alias gcm="git commit -m"
 alias gco='git checkout'
 alias gcob='git checkout -b'
 alias gcp='git cherry-pick'
+alias gcpn='git cherry-pick -n'
 alias gd='git diff'
 alias gdc='git diff --cached'
 alias gdm='git diff master'
 alias gds='git diff --stat=160,120'
 alias gdw='git diff --color-words'
 alias gf='git fetch'
+alias gfix="ga && git commit -a --amend -C HEAD"
+alias gfo='git fetch origin'
+alias gfm='git fetch origin master'
 alias gh="source ~/.githelpers && show_git_head"
 alias gl='gll -25'
 alias gli='git show --pretty="format:" --name-only'
 alias gll="source ~/.githelpers && pretty_git_log"
 alias gla='gll --all'
 alias glog='git log'
+alias glogf='git log --follow'
 alias gm='git merge'
 alias gmff='git merge --ff-only'
+alias gmffs='git merge --ff-only --squash'
 alias gmtheirs='git merge -Xtheirs'
 alias gp='git push'
 alias gpd='git push && git push heroku master'
+alias gpp='git push && git push production HEAD:production'
 alias gph='git push heroku master'
 alias gpf='git push -f'
 alias gpu='git push -u'
 alias gpff='git pull --ff-only'
 alias gpl='git pull'
+alias gpo='git push origin'
 alias gpom='git push origin master'
 alias gpr='git pull --rebase'
 alias gr='git reset'
 alias grb='git rebase'
 alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
-alias grbo='git fetch origin && git rebase origin/master'
-alias grbm='git rebase master'
+alias grbi='git rebase -i'
+alias grbm='git fetch origin master && git rebase master'
+alias grbo='git fetch origin master && git rebase origin/master'
 alias gre='git remote'
 alias gref='git reflog'
 alias grev='git remote -v'
@@ -144,9 +156,12 @@ alias learn='cd ~/code/learning-area'
 alias robo='cd ~/code/projects/robocoin'
 alias roboa='cd ~/code/projects/robocoin/angular'
 alias pcg='cd ~/code/work/pcg'
-alias sc='cd ~/code/work/redwood/scene-app/angular'
 alias cur='cd ~/code/projects/things'
 
+# Work
+alias pcgt='vim ~/code/work/pcg/docs/time-tracker.txt'
+alias pcgn='vim ~/code/work/pcg/docs/personal-notes.txt'
+
 # Open Source
 alias ssh-discourse='ssh -F ~/code/projects/discourse/.project/vagrant.ssh.conf default'