diff options
Diffstat (limited to 'plugins/git/git.plugin.zsh')
| -rw-r--r-- | plugins/git/git.plugin.zsh | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index d59e0ca9f..bbee13ab8 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -68,10 +68,12 @@ alias gc!='git commit -v --amend' alias gca='git commit -v -a' alias gca!='git commit -v -a --amend' alias gcan!='git commit -v -a -s --no-edit --amend' +alias gcam='git commit -a -m' alias gcb='git checkout -b' alias gcf='git config --list' alias gcl='git clone --recursive' -alias gclean='git reset --hard && git clean -dfx' +alias gclean='git clean -fd' +alias gpristine='git reset --hard && git clean -dfx' alias gcm='git checkout master' alias gcmsg='git commit -m' alias gco='git checkout' @@ -101,11 +103,15 @@ git push --force origin "${b:=$1}" } compdef _git ggf=git-checkout ggl() { +if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then +git pull origin "${*}" +else [[ "$#" == 0 ]] && local b="$(current_branch)" -git pull origin "${b:=$1}" "${*[2,-1]}" +git pull origin "${b:=$1}" +fi } compdef _git ggl=git-checkout -alias ggpull='ggl' +alias ggpull='git pull origin $(current_branch)' compdef _git ggpull=git-checkout ggp() { if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then @@ -116,7 +122,7 @@ git push origin "${b:=$1}" fi } compdef _git ggp=git-checkout -alias ggpush='ggp' +alias ggpush='git push origin $(current_branch)' compdef _git ggpush=git-checkout ggpnp() { if [[ "$#" == 0 ]]; then |