diff --git a/.bash_aliases b/.bash_aliases index 003e726..fc99dc5 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -2,6 +2,7 @@ alias 'editalias'='vim ~/.bash_aliases && . ~/.bash_aliases' alias 'otheralias'='vim ~/.other_aliases && . ~/.bash_aliases' alias 'viewalias'='view ~/.bash_aliases' +alias 'refreshalias'='source ~/.bash_aliases' alias 'editssh'='vim ~/.ssh/config' alias 'update'='sudo apt update' alias 'upgrade'='sudo apt update && sudo apt upgrade' @@ -24,6 +25,8 @@ alias 'gad'='git add . && git diff --cached' alias 'gdiff'='git diff' alias 'status'='git status' alias 'pull'='git pull --rebase' +alias 'merge'='git merge --ff-only' +alias 'upstream'='git push --set-upstream origin' alias 'push'='git push' alias 'branch'='git branch' alias 'unstage'='git reset HEAD'