mirror of
https://github.com/dcarrillo/prezto.git
synced 2024-12-23 00:17:59 +00:00
[Fix #67] Rename git-branch to git-current-branch
There is a name collision in Git versions older than 1.6.0, which install the git-* commands in $PATH.
This commit is contained in:
parent
c435dca233
commit
25405b226b
@ -154,9 +154,9 @@ alias gpA='git push --all && git push --tags'
|
||||
compdef _git gpA=git-push
|
||||
alias gpt='git push --tags'
|
||||
compdef _git gpt=git-push
|
||||
alias gpc='git push --set-upstream origin "$(git-branch)"'
|
||||
alias gpc='git push --set-upstream origin "$(git-current-branch)"'
|
||||
compdef _git gpc=git-push
|
||||
alias gpp='git pull origin "$(git-branch)" && git push origin "$(git-branch)"'
|
||||
alias gpp='git pull origin "$(git-current-branch)" && git push origin "$(git-branch)"'
|
||||
|
||||
# Rebase (r)
|
||||
alias gr='git rebase'
|
||||
|
@ -16,7 +16,7 @@ url=$(
|
||||
branches=($(
|
||||
git branch -r | sed -e "/${remote}\/HEAD -> ${remote}/d" -e "s/^[[:space:]]*${remote}\///g"
|
||||
))
|
||||
current_branch="$(git-branch)"
|
||||
current_branch="$(git-current-branch)"
|
||||
branch="${2:-master}"
|
||||
file="$3"
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user