From 6afc137b31821b12c0409a1dbb534a31f9608bae Mon Sep 17 00:00:00 2001 From: Nathan Stilwell Date: Wed, 21 May 2014 15:37:03 -0400 Subject: [PATCH] remove some nocorrects, add some gerrit --- custom/corrections.zsh | 4 +--- plugins/gerrit/gerrit.plugin.zsh | 2 ++ 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/custom/corrections.zsh b/custom/corrections.zsh index 4b8139924..4e1861509 100644 --- a/custom/corrections.zsh +++ b/custom/corrections.zsh @@ -1,10 +1,8 @@ -alias node='nocorrect node' alias ack='nocorrect ack' alias hg='nocorrect hg' -alias npm='nocorrect npm' alias figlet="nocorrect figlet" alias ksdiff="nocorrect ksdiff" alias scala="nocorrect scala" alias grunt="nocorrect grunt" alias idea="nocorrect idea" -alias rake="noglob rake" \ No newline at end of file +alias rake="noglob rake" diff --git a/plugins/gerrit/gerrit.plugin.zsh b/plugins/gerrit/gerrit.plugin.zsh index 899ee4830..17ba62fcd 100644 --- a/plugins/gerrit/gerrit.plugin.zsh +++ b/plugins/gerrit/gerrit.plugin.zsh @@ -24,6 +24,7 @@ function gerrit_patch_usage () { echo " commit Amend the patchset commit"; echo " review Submit patchset back to the gerrit for review"; echo " draft Submit patchset back to the gerrit for review as draft"; + echo " rebase Rebase onto master into patchset"; echo } @@ -52,6 +53,7 @@ function gerrit_patch () { [ $1 = "commit" ] && git commit --amend; [ $1 = "review" ] && gerrit_review "master"; [ $1 = "draft" ] && gerrit_draft "master"; + [ $1 = "rebase" ] && gerrit_pull "master"; fi }