From 03aac845920daf851e547be8bbb6b3086c008eeb Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Sat, 21 Mar 2015 15:13:00 -0400
Subject: [PATCH] New aliases

---
 zsh/aliases | 11 +++++++++--
 zshrc       |  1 +
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/zsh/aliases b/zsh/aliases
index 01b4b87..ca0b99e 100644
--- a/zsh/aliases
+++ b/zsh/aliases
@@ -151,13 +151,14 @@ alias gpa='git push && echo "pushing tags..." && git push --tags'
 alias gpd='git push && git push heroku master'
 alias gpdf='gpf && gphf'
 alias gpp='echo "Pushing Upstream master to production" && git push production upstream/master:master'
-alias gps='git push staging master -f'
+alias gppp='echo "Pushing to remotes first..." && git push origin master:master && git push upstream master:master && echo "Pushing upstream master to Production..." && git push production upstream/master:master'
+alias gps='git push staging'
 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 gpu='git push -u origin'
 alias gpup='git push upstream master'
 alias gpff='git pull --ff-only'
 alias gpl='git pull'
@@ -194,6 +195,12 @@ alias gsd='git stash drop'
 alias gsdl='git stash drop stash@{0}'
 alias gsl='git stash list'
 alias gsp='git stash pop'
+alias gsp1='git stash pop stash@{0}'
+alias gsp2='git stash pop stash@{1}'
+alias gsp3='git stash pop stash@{2}'
+alias gsp4='git stash pop stash@{3}'
+alias gsp5='git stash pop stash@{4}'
+alias gsp6='git stash pop stash@{5}'
 alias gt='git tag'
 alias gta='git tag -a'
 alias gtd='git tag -d'
diff --git a/zshrc b/zshrc
index d5003d9..45c38c0 100644
--- a/zshrc
+++ b/zshrc
@@ -86,3 +86,4 @@ export PYTHONPATH=${ANSIBLE_DIR}/lib:${PYTHONPATH}
 export ANSIBLE_LIBRARY=${ANSIBLE_DIR}/library
 export MANPATH=${ANSIBLE_DIR}/docs/man:${MANPATH}
 export ANSIBLE_HOSTS=~/.ansible_hosts
+export LEIN_FAST_TRAMPOLINE=y