1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-22 18:38:00 +00:00

Rename git-current-branch to git-branch-current

This commit is contained in:
Sorin Ionescu 2012-05-21 16:11:32 -04:00
parent d3cad0721b
commit 00394b6069
3 changed files with 3 additions and 3 deletions

View File

@ -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'

View File

@ -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"