Rename git-current-branch to git-branch-current
This commit is contained in:
parent
d3cad0721b
commit
00394b6069
|
@ -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'
|
||||||
|
|
|
@ -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"
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue