From e4b7c0de5a876d3ffc537f31909c5f6e79b8772d Mon Sep 17 00:00:00 2001
From: Michael Campagnaro <mikecampo@gmail.com>
Date: Mon, 30 Sep 2019 16:51:05 -0400
Subject: [PATCH] Update aliases (mostly removing heroku stuff)

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

diff --git a/aliases b/aliases
index b35fb33..463e42b 100644
--- a/aliases
+++ b/aliases
@@ -103,18 +103,6 @@ alias f='fg'
 alias functions='vim ~/.dotfiles/functions'
 alias history='fc -l 1'
 alias histroy='history'
-# alias h='heroku'
-# alias ho='heroku open'
-# alias hc='heroku config'
-# alias hca='heroku config:add'
-# alias hcu='heroku config:unset'
-# alias hcr='heroku config:unset'
-# alias hl='heroku logs -t -n 5000'
-# alias hmo='heroku maintenance:on'
-# alias hmoo='heroku maintenance:off'
-# alias hr='heroku releases'
-# alias hrs='heroku restart'
-# alias hscale='heroku ps:scale '
 alias irb='irb --readline -r irb/completion'
 alias lcc='lein clean'
 alias lca='lein cljsbuild auto dev'
@@ -181,10 +169,11 @@ function dl_twitch_vid {
     mkdir -p $dir
     cd $dir
     rechat.exe -D $url
-    rm *.json
+    tt *.json
     youtube-dl.exe -f "$format" -o "%(upload_date)s-%(title)s-twitch-%(id)s.%(ext)s" $url
     cd ..
 }
+alias tw-dl='youtube-dl.exe -f "1080p" -o "%(upload_date)s-%(title)s-twitch-%(id)s.%(ext)s"'
 alias tw-download='dl_twitch_vid "1080p"'
 alias tw-download-60='dl_twitch_vid "1080p60"'
 alias tw-download-720='dl_twitch_vid "720p-1"'
@@ -268,16 +257,13 @@ alias gmffm='git merge --ff-only master'
 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 gpa='git push --all && echo "pushing tags..." && git push --tags'
 alias gpdf='gpf && gphf'
 alias gpp='echo "Pushing Upstream master to production" && git push production master'
 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 gpu='git push --set-upstream origin HEAD'
 alias gpff='git pull --ff-only'
 alias gplup='git pull upstream master'
@@ -301,6 +287,7 @@ alias gre='git remote'
 alias grea='git remote add'
 alias gremo='git remote remove origin; git remote add origin'
 alias greao='git remote add origin'
+alias gred='git remote remove'
 alias gref='git reflog --format="%C(auto)%h %<|(17)%gd %C(cyan)%ci%C(reset) [%gs] %C(yellow)(%s)%C(reset)"'
 alias grev='git remote -v'
 alias grm='git rm'