diff --git a/zsh/zshrc b/zsh/zshrc index 0abd64b..4811d6c 100755 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -236,16 +236,17 @@ alias co='git checkout' alias d='git diff' alias dc='git diff --cached' alias ds='git diff --stat' +alias f='hub fetch' alias g='git grep' alias gl='git log' alias glo='git log --oneline --decorate' alias gls='git log --stat' alias gpr='git pull --rebase' -alias m='git merge' +alias m='hub merge' alias pob='git-pull-origin-branches' -alias r='git remote' +alias r='hub remote' +alias ra='hub remote add' alias rbi='git rebase -i' -alias ra='git remote add' GIT_VERSION="$(git --version | grep -oE '[0-9]+\.[0-9]+\.[0-9]+')" GIT_VERSION_MAJOR="${GIT_VERSION%%.*}" GIT_VERSION_MINOR="${${GIT_VERSION%.*}#*.}"