Updates

zsh/aliases

@@ -25,6 +25,8 @@ alias be='bundle exec'
 alias bi='bundle install'
 alias be='bundle exec'
 alias beg='bundle exec guard'
+alias bl='brew link --overwrite'
+alias bld='brew link --overwrite --dry-run'
 alias bower='noglob bower'
 alias bu='bundle update'
 alias bo='bundle open'
@@ -40,6 +42,8 @@ alias dr='cd ~/Dropbox'
 alias duh='du -csh'
 alias functions='vim ~/.dotfiles/zsh/functions'
 alias f='fg'
+alias gib='gem install bundler'
+alias gems='cd ~/pcg/gems'
 alias history='fc -l 1'
 alias histroy='history'
 alias h='heroku'
@@ -52,6 +56,7 @@ alias rbg='rbenv gemset active'
 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 rl='reload'
 alias rmr='rm -rf'
 alias rc='rails console'
 alias rs='rails server'
@@ -80,13 +85,14 @@ alias gaa='git add -A'
 alias gau='git add --update'
 alias gb='git branch'
 alias gbd='git branch -D'
+alias gbl='git branch --all'
 alias gc='git commit'
 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 gcps='git cherry-pick -n'
 alias gd='git diff'
 alias gdc='git diff --cached'
 alias gdm='git diff master'
@@ -108,6 +114,7 @@ alias gmff='git merge --ff-only'
 alias gmffs='git merge --ff-only --squash'
 alias gmtheirs='git merge -Xtheirs'
 alias gp='git push'
+alias gpa='git push && echo "pushing tags..." && git push --tags'
 alias gpd='git push && git push heroku master'
 alias gpdf='gpf && gphf'
 alias gpp='git push && git push production HEAD:production'
@@ -122,12 +129,14 @@ alias gpl='git pull'
 alias gpo='git push origin'
 alias gpom='git push origin master'
 alias gpr='git pull --rebase'
+alias gpt='git push --tags'
 alias gr='git reset'
 alias grb='git rebase'
 alias grba='git rebase --abort'
 alias grbc='git rebase --continue'
 alias grbi='git rebase -i'
 alias grbm='git fetch origin master && git rebase master'
+alias grbmi='git fetch origin master && git rebase master -i'
 alias grbo='git fetch origin master && git rebase origin/master'
 alias gre='git remote'
 alias gref='git reflog'
@@ -142,20 +151,23 @@ alias gss='git stash save'
 alias gsd='git stash drop'
 alias gsl='git stash list'
 alias gsp='git stash pop'
+alias gt='git tag'
+alias gta='git tag -a'
+alias gtd='git tag -d'
+alias gtl='git tag -l'
 alias gx='git reset --hard'
+alias gxx='git reset --hard HEAD~1 && git pull --ff-only'
 
 # Notes
 alias art='cd ~/Dropbox/notes/art'
 alias bucket='cd ~/Dropbox/notes/buckets'
-alias completion='cd ~/Dropbox/notes/daily/daily-log/completion-list'
-alias daily='cd ~/Dropbox/notes/daily'
-alias guide='vim ~/Dropbox/notes/daily/DAILY_GUIDE'
+alias daily='cd ~/Dropbox/notes/daily/daily-log'
 alias log='cd ~/Dropbox/notes/daily/daily-log'
 alias notes='cd ~/Dropbox/notes'
 alias pn='vim ~/Dropbox/notes/project-notes'
-alias powerup='vim ~/Dropbox/notes/code/powerup'
 alias sharp='vim ~/Dropbox/notes/sharpening-notes'
 alias todo='vim ~/Dropbox/notes/daily/todo'
+alias writing='cd ~/Dropbox/notes/writing'
 
 # Projects
 alias projects='cd ~/code/projects'
@@ -164,10 +176,7 @@ alias weba='cd ~/code/projects/websites/michael.is/angular'
 alias dot='cd ~/code/projects/dotfiles'
 alias work='cd ~/code/work'
 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 cur='cd ~/code/projects/things'
 
 # Work
 alias pcgt='vim ~/code/work/pcg/files/time-tracker.txt'

zsh/functions

@@ -73,3 +73,15 @@ function run_quirk() {
   quirk
 }
 
+function bump_gem_version {
+  if [[ $# -eq 0 ]]; then
+    echo "usage: $0 <version>"
+  else
+    echo "Committing version bump"
+    git add . && git commit -m "Version ${1}"
+    echo "Creating tag v$1"
+    git tag -a v${1} -m "Tagging v${1}"
+    git push origin && git push origin --tags
+  fi
+}
+