Browse Source

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

master
Sorin Ionescu 13 years ago
parent
commit
00394b6069
  1. 4
      modules/git/alias.zsh
  2. 0
      modules/git/functions/git-branch-current
  3. 2
      modules/git/functions/git-hub

4
modules/git/alias.zsh

@ -96,8 +96,8 @@ alias gpf='git push --force' @@ -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'

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

2
modules/git/functions/git-hub

@ -16,7 +16,7 @@ url=$( @@ -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"

Loading…
Cancel
Save