diff --git a/modules/git/alias.zsh b/modules/git/alias.zsh index c1e1cc9..611ce9e 100644 --- a/modules/git/alias.zsh +++ b/modules/git/alias.zsh @@ -96,8 +96,8 @@ alias gpf='git push --force' alias gpa='git push --all' alias gpA='git push --all && git push --tags' alias gpt='git push --tags' -alias gpc='git push --set-upstream origin "$(git-current-branch)"' -alias gpp='git pull origin "$(git-current-branch)" && git push origin "$(git-branch)"' +alias gpc='git push --set-upstream origin "$(git-branch-current)"' +alias gpp='git pull origin "$(git-branch-current)" && git push origin "$(git-branch-current)"' # Rebase (r) alias gr='git rebase' diff --git a/modules/git/functions/git-current-branch b/modules/git/functions/git-branch-current similarity index 100% rename from modules/git/functions/git-current-branch rename to modules/git/functions/git-branch-current diff --git a/modules/git/functions/git-hub b/modules/git/functions/git-hub index dd3ce38..8d2e494 100644 --- a/modules/git/functions/git-hub +++ b/modules/git/functions/git-hub @@ -16,7 +16,7 @@ url=$( branches=($( git branch -r | sed -e "/${remote}\/HEAD -> ${remote}/d" -e "s/^[[:space:]]*${remote}\///g" )) -current_branch="$(git-current-branch)" +current_branch="$(git-branch-current)" branch="${2:-master}" file="$3"