From ee263b39ca1fa517bd27f870d3dcfdf42349a154 Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Thu, 13 Jul 2017 16:02:25 -0400
Subject: [PATCH] Update aliases

---
 aliases | 17 ++++-------------
 1 file changed, 4 insertions(+), 13 deletions(-)

diff --git a/aliases b/aliases
index 78e4a41..db09c67 100644
--- a/aliases
+++ b/aliases
@@ -40,15 +40,11 @@ alias cd.....='cd ../../../..'
 
 alias aliases='vim ~/.dotfiles/aliases'
 alias al='aliases'
-alias b='bundle'
-alias be='bundle exec'
-alias bi='bundle install'
-alias beg='bundle exec guard'
+alias b='./build'
 alias bl='brew link --overwrite'
 alias bld='brew link --overwrite --dry-run'
 alias bower='noglob bower'
-alias bu='bundle update'
-alias bo='bundle open'
+alias br='./build ; ./run'
 alias cr='RUSTFLAGS="$RUSTFLAGS -A unused_variables -A dead_code -A unused_parens" cargo run'
 alias crr='cargo run --release'
 alias cb='RUSTFLAGS="$RUSTFLAGS -A unused_variables -A dead_code -A unused_parens" cargo build'
@@ -65,7 +61,6 @@ alias pdot='cd ~/.private-dotfiles'
 alias duh='du -csh'
 alias functions='vim ~/.dotfiles/functions'
 alias f='fg'
-alias gib='gem install bundler'
 alias history='fc -l 1'
 alias histroy='history'
 alias h='heroku'
@@ -99,13 +94,11 @@ alias mp='mvn package'
 alias mcp='mvn clean package'
 alias patch='git format-patch HEAD^ --stdout > patch.diff'
 alias reguard='killall -9 ruby ; guard'
-alias r='rails'
-alias rr='bundle exec rake release'
+alias r='./run'
 alias rb='rbenv'
 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'
 
 function reload {
   if [[ $platform == 'Linux' || $platform == 'Darwin' ]]; then
@@ -157,12 +150,11 @@ alias ga='git add -A :/'
 alias gaa='git add -A'
 alias gaap='git add -Ap'
 alias gau='git add --update'
-alias gb='git branch'
+alias gb='git branch -v'
 alias gbd='git branch -D'
 alias gbl='git branch --all'
 alias gbm='git branch -m'
 alias gbr='git branch -rv'
-alias gbv='git branch -v'
 alias gc='git commit'
 alias gcs='git commit -S'
 alias gcl='git clone'
@@ -213,7 +205,6 @@ alias gph='echo "pushing $(git symbolic-ref HEAD 2>/dev/null | cut -d"/" -f 3) t
 alias gphf='git push heroku master --force'
 alias gpu='git push --set-upstream origin HEAD'
 alias gpff='git pull --ff-only'
-alias gpl='echo "you may want to use gpff instead" ; git pull'
 alias gplup='git pull upstream master'
 alias gpo='git push origin'
 alias gpom='git push origin master'