From ccd0cf5e6c32fdde0ca7e3678b064a8b856b1de2 Mon Sep 17 00:00:00 2001 From: Michael Campagnaro Date: Tue, 29 Sep 2020 16:53:38 -0400 Subject: [PATCH] Update aliases --- aliases | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/aliases b/aliases index df49e9a..27ca6fe 100644 --- a/aliases +++ b/aliases @@ -483,6 +483,7 @@ alias rcc='rclone copy' alias restart='sudo shutdown now -r' alias rl='reload' alias rmr='rm -r' +alias rmrf='rm -rf' alias s='cd ~/.ssh' alias sc='vim ~/.ssh/config' alias shutdown='sudo shutdown now' @@ -614,16 +615,15 @@ alias gmffs='git merge --ff-only --squash' alias gmtheirs='git merge -Xtheirs' alias gp='git push' alias gpa='git push --all && echo "pushing tags..." && git push --tags' -alias gpdf='gpf && gphf' -alias gps='git push staging' -alias gppf='gpf && git push production HEAD:production -f' -alias gpu='git push --set-upstream origin HEAD' +alias gpf='git push -f' alias gpff='git pull --ff-only' +alias gplu='git pull --set-upstream origin HEAD' alias gplup='git pull upstream master' alias gpo='git push origin' alias gpom='git push origin master' alias gpr='git pull --rebase' alias gpt='git push --tags' +alias gpu='git push --set-upstream origin HEAD' alias gr='git reset' alias gr1='git reset HEAD^1' alias grb='git rebase'