sqozz/prezto_config
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[Fix #67] Rename git-branch to git-current-branch

Browse source 
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:
Sorin Ionescu 2012-03-27 14:29:13 -04:00
parent c435dca233
commit 25405b226b
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
plugins/git/alias.zsh
View file

@ -154,9 +154,9 @@ alias gpA='git push --all && git push --tags'
compdef _git gpA=git-push compdef _git gpA=git-push
alias gpt='git push --tags' alias gpt='git push --tags'
compdef _git gpt=git-push 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 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) # Rebase (r)
alias gr='git rebase' alias gr='git rebase'

0
plugins/git/functions/git-branch → plugins/git/functions/git-current-branch
View file

2
plugins/git/functions/git-hub
View file

@ -16,7 +16,7 @@ url=$(
branches=($( branches=($(
git branch -r | sed -e "/${remote}\/HEAD -> ${remote}/d" -e "s/^[[:space:]]*${remote}\///g" 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}" branch="${2:-master}"
file="$3" file="$3"