Update vimrc and aliases

zsh/aliases

@@ -20,7 +20,7 @@ alias cd/='cd /'
 alias ls='ls -G'
 
 alias aliases='vim ~/.dotfiles/zsh/aliases'
-alias functions='vim ~/.dotfiles/zsh/functions'
+alias b='bundle'
 alias bake='bundle exec rake'
 alias be='bundle exec'
 alias bi='bundle install'
@@ -32,6 +32,23 @@ alias code='cd ~/code'
 alias d='cd ~/.dotfiles'
 alias dr='cd ~/Dropbox'
 alias duh='du -csh'
+alias functions='vim ~/.dotfiles/zsh/functions'
+alias f='fg'
+alias history='fc -l 1'
+alias h='heroku'
+alias irb='irb --readline -r irb/completion'
+alias patch='git format-patch HEAD^ --stdout > patch.diff'
+alias reguard='killall -9 ruby ; guard'
+alias r='rails'
+alias rc='rails console'
+alias reload='source ~/.zshrc'
+alias tail-logs='heroku logs -t'
+alias u='cd ..'
+alias v='vim'
+alias vi='vim'
+alias vimrc='vim ~/.vimrc'
+alias zsh='vim ~/.zshrc'
+
 
 # Git
 alias ammend='amend'
@@ -54,52 +71,43 @@ alias gds='git diff --stat=160,120'
 alias gdw='git diff --color-words'
 alias gf='git fetch'
 alias gh="source ~/.githelpers && show_git_head"
-alias gl="source ~/.githelpers && pretty_git_log"
-alias gll='git ll -25'
-alias gla='git ll --all'
-alias gmff='git merge -ff-only'
+alias gl='gll -25'
+alias gll="source ~/.githelpers && pretty_git_log"
+alias gla='gll --all'
+alias gmff='git merge --ff-only'
 alias gmtheirs='git merge -Xtheirs'
 alias gp='git push'
 alias gpf='git push -f'
 alias gpff='git pull --ff-only'
+alias gpl='git pull'
 alias gpom='git push origin master'
 alias gpr='git pull --rebase'
 alias gr='git reset'
+alias grbm='git rebase master'
 alias grc='git rebase --continue'
 alias gre='git remote'
 alias gsnapshot='git stash save "snapshot: $(date)" && git stash apply "stash@{0}"'
 alias gst='git status'
 alias gs='git stash'
-alias gsa='git stash apply'
+alias gsa='git stash save'
 alias gsd='git stash drop'
 alias gsl='git stash list'
 alias gsp='git stash pop'
 alias gx='git reset --hard'
 
-alias history='fc -l 1'
-alias irb='irb --readline -r irb/completion'
-alias patch='git format-patch HEAD^ --stdout > patch.diff'
-alias reguard='killall -9 ruby ; guard'
-alias r='rails'
-alias rc='rails console'
-alias reload='source ~/.zshrc'
-alias tail-logs='heroku logs -t'
-alias u='cd ..'
-alias v='vim'
-alias vi='vim'
-alias vimrc='vim ~/.vimrc'
-alias zsh='vim ~/.zshrc'
-
 # Notes
 alias todo='vim ~/Dropbox/notes/life-todo'
-alias wtodo='vim ~/Dropbox/notes/work-todo'
+alias wtodo='vim ~/Dropbox/work/redwood/notes/work-todo'
 alias sharp='vim ~/Dropbox/notes/sharpening-notes'
 alias completion='vim ~/Dropbox/notes/completion-list'
+alias powerup='vim ~/code/learning-area/notes/powerup'
+alias pnotes='vim ~/Dropbox/notes/programming-notes'
+alias wnotes='vim ~/Dropbox/work/redwood/notes/project-notes'
 
 # Projects
 alias projects='cd ~/code/projects'
 alias dot='cd ~/code/projects/dotfiles'
-alias perks='cd ~/code/work/src/campusperks'
+alias p='cd ~/code/work/redwood/campusperks'
 alias work='cd ~/code/work'
 alias learn='cd ~/code/learning-area'
 alias current='cd ~/code/learning-area/languages-frameworks/elixir/introducing-elixir/physics'

zsh/functions

@@ -26,7 +26,7 @@ function git-nuke {
 
 function git-on-master {
   branch=`git_branch_name`
-  git checkout master && git pull --rebase 
+  git checkout master && git pull --rebase
   git checkout $branch
   git rebase master
   }
@@ -63,3 +63,9 @@ function google() {
 function chrome () {
   open -a /Applications/Google\ Chrome.app/ "$1"
 }
+
+# See top 10 bash commands
+function hist() {
+   cat ~/.history|cut -d ';' -f 2- 2>/dev/null| awk '{a[$1]++ } END{for(i in a){print a[i] " " i}}'|sort -rn|head
+}
+