diff options
| author | Robby Russell <robby@planetargon.com> | 2015-06-17 14:13:15 -0700 |
|---|---|---|
| committer | Robby Russell <robby@planetargon.com> | 2015-06-17 14:13:15 -0700 |
| commit | 599831b85a5fd4564ab820530e2bb45f37ca3f99 (patch) | |
| tree | 2d256f6c8118173e8e9912c5704b49c11b9164a2 /plugins | |
| parent | ab18795f3cd9bd45aec60a4a4bd8ecf820eb86c4 (diff) | |
| parent | d24196cfbdb1b1c7a7055d6dae97c4e4c3e2b4c3 (diff) | |
| download | zsh-599831b85a5fd4564ab820530e2bb45f37ca3f99.tar.gz zsh-599831b85a5fd4564ab820530e2bb45f37ca3f99.tar.bz2 zsh-599831b85a5fd4564ab820530e2bb45f37ca3f99.zip | |
Merge pull request #4058 from ncanceill/plugin-git
[Hotfix] Git plugin
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/git/git.plugin.zsh | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/plugins/git/git.plugin.zsh b/plugins/git/git.plugin.zsh index d59e0ca9f..cc6eb1031 100644 --- a/plugins/git/git.plugin.zsh +++ b/plugins/git/git.plugin.zsh @@ -101,11 +101,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 +120,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 |