Updates

zsh/aliases

@@ -5,6 +5,7 @@ if [[ $platform == 'Linux' ]]; then
   alias ll='ls -lrth --color'
 elif [[ $platform == 'Darwin' ]]; then
   alias l='ls -laG'
+  alias ls='ls -laG'
   alias ll='ls -lG'
 fi
 
@@ -32,17 +33,18 @@ alias bo='bundle open'
 alias cls=clear
 alias code='cd ~/code'
 alias cpr='cp -r'
-alias d='dart'
+alias cw='compass watch'
+alias d='cd ~/work/dive-networks/dive'
 alias da='dartanalyzer'
 alias dc='dart --checked'
 alias dd='dartdoc'
-alias dot='cd ~/.dotfiles'
+alias dot='cd ~/.'
 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 gems='cd ~/dive-networks/gems'
 alias history='fc -l 1'
 alias histroy='history'
 alias h='heroku'
@@ -51,13 +53,16 @@ alias hc='heroku config'
 alias hca='heroku config:add'
 alias hcu='heroku config:unset'
 alias irb='irb --readline -r irb/completion'
+alias lcc='lein clean'
+alias lca='lein cljsbuild auto dev'
+alias ldi='lein deps install'
 alias li='lineman'
 alias lir='lineman run'
 alias lib='lineman build'
 alias lig='lineman grunt'
 alias lis='lineman spec'
 alias lic='lineman spec-ci'
-alias lmi='lein modules install'
+alias lsd='lein start-dev'
 alias mc='mvn compile'
 alias mct='mvn test'
 alias mi='mvn install'
@@ -123,10 +128,12 @@ alias gdm='git diff master'
 alias gds='git diff --stat=160,120'
 alias gdw='git diff --color-words'
 alias gf='git fetch'
+alias gfa='git fetch --all'
 alias gfix="git commit --amend -C HEAD"
 alias gfixs="git commit -S -a --amend -C HEAD" # signed
 alias gfo='git fetch origin'
 alias gfm='git fetch origin master'
+alias gfup='git fetch upstream'
 alias gh="source ~/.githelpers && show_git_head"
 alias gl='gll -25'
 alias gli='git show --pretty="format:" --name-only'
@@ -143,15 +150,18 @@ 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'
-alias gppp='git push production'
+alias gpp='echo "Pushing Upstream master to production" && git push production upstream/master:master'
+alias gps='git push staging master -f'
+alias gpps='echo "Pushing Upstream master to staging" && git push staging upstream/master:master -f'
 alias gppf='gpf && git push production HEAD:production -f'
 alias gph='echo "pushing $(git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3) to Heroku master" && git push heroku HEAD:master'
 alias gphf='git push heroku master --force'
 alias gpf='git push -f'
 alias gpu='git push -u origin master'
+alias gpup='git push upstream master'
 alias gpff='git pull --ff-only'
 alias gpl='git pull'
+alias gplup='git pull upstream master'
 alias gpo='git push origin'
 alias gpom='git push origin master'
 alias gpr='git pull --rebase'
@@ -164,12 +174,17 @@ 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 grbmo="echo 'use grbo instead'"
+alias grbu='git fetch upstream master && git rebase upstream/master'
+alias grbup='echo "use grbu"'
+alias grbupm='echo "use grbu"'
 alias gre='git remote'
 alias grea='git remote add'
 alias greao='git remote add origin'
 alias gref='git reflog'
 alias grev='git remote -v'
 alias grm='git rm'
+alias grmr='git rm -r'
 alias gsnapshot='git stash save "snapshot: $(date)" && git stash apply "stash@{0}"'
 alias gsh='git show'
 alias gst='git status'
@@ -189,36 +204,20 @@ alias gxx='git reset --hard HEAD~1 && git pull --ff-only'
 alias gstats="echo 'Total commits: $(git rev-list HEAD --count)'; echo '\nAuthor breakdown:'; git shortlog | grep -E '^[^ ]'"
 
 # Notes
-alias art='cd ~/Dropbox/notes/art'
 alias notes='cd ~/jelly/documents'
-alias bucket='cd ~/Dropbox/notes/buckets'
 alias pn='vim ~/jelly/documents/Notes/stack.txt'
-alias sharp='vim ~/Dropbox/notes/sharpening-notes'
 alias writing='cd ~/brain/writing'
-alias what='cd ~/brain/writing/2014/what-happened'
 
 # Projects
 alias projects='cd ~/jelly/projects'
-alias web='cd ~/jelly/projects/websites/michael.is'
-alias weba='cd ~/jelly/projects/websites/michael.is/angular'
-alias dot='cd ~/jelly/dev/projects/dotfiles'
+alias dot='cd ~/jelly/projects/dotfiles'
 alias work='cd ~/work'
 alias brain='cd ~/brain'
 alias school='cd ~/brain/school'
-alias pcg='cd ~/work/pcg'
-alias dive='cd ~/work/pcg/dive-network/dive'
-alias di='cd ~/work/pcg/dive-network/dive/src-cljs/dive'
+alias pcg='cd ~/work/dive-networks'
+alias dive='cd ~/work/dive-networks/dive/dive-web-app'
+alias di='cd ~/work/dive-networks/dive/dive-web-app/src/cljs/dive'
 
 # Work
-alias pcgn='vim ~/work/pcg/files/notes/personal-notes.md'
-alias pcgr='vim ~/work/pcg/files/notes/refactoring-notes.md'
-alias pcgf='cd ~/work/pcg/files'
-alias bastion='ssh 54.86.79.26 -l pcg-user -i ~/.ssh/pcg-ec2-pcg-user'
-alias sigma='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@sigma'
-alias qonos='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@qonos'
-alias samza1='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@samza1'
-alias samza2='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@samza2'
-alias samza3='cd ~/pcg/pcg-ansible && ssh -vF files/ssh/config pcg-user@samza3'
-alias dstaging='ssh pcg-user@192.168.2.20 -i ~/.ssh/dive_20140923_rsa'
-alias dclear='ssh pcg-user@192.168.2.90 -i ~/.ssh/dive_20140923_rsa'
+source ~/work/dive-networks/aliases
 alias dh='git push heroku-staging master -f'