adam/prezto
Archived
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
modules/git/alias.zsh
View File

@ -96,8 +96,8 @@ alias gpf='git push --force'
alias gpa='git push --all' alias gpa='git push --all'
alias gpA='git push --all && git push --tags' alias gpA='git push --all && git push --tags'
alias gpt='git push --tags' alias gpt='git push --tags'
alias gpc='git push --set-upstream origin "$(git-current-branch)"' alias gpc='git push --set-upstream origin "$(git-branch-current)"'
alias gpp='git pull origin "$(git-current-branch)" && git push origin "$(git-branch)"' alias gpp='git pull origin "$(git-branch-current)" && git push origin "$(git-branch-current)"'
# Rebase (r) # Rebase (r)
alias gr='git rebase' alias gr='git rebase'

0
modules/git/functions/git-current-branch → modules/git/functions/git-branch-current
View File

2
modules/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-current-branch)" current_branch="$(git-branch-current)"
branch="${2:-master}" branch="${2:-master}"
file="$3" file="$3"