From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 12390 invoked by alias); 13 Sep 2013 23:35:10 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 31726 Received: (qmail 15840 invoked from network); 13 Sep 2013 23:35:04 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00 autolearn=ham version=3.3.2 Received-SPF: none (ns1.primenet.com.au: domain at openwrt.org does not designate permitted sender hosts) X-Virus-Scanned: at arrakis.dune.hu From: Luka Perkov To: zsh-workers@zsh.org Cc: Luka Perkov Subject: [PATCH] _git: add few more arguments for cherry-pick and revert Date: Sat, 14 Sep 2013 01:34:13 +0200 Message-Id: <1379115253-2170-1-git-send-email-luka@openwrt.org> X-Mailer: git-send-email 1.8.4 Signed-off-by: Luka Perkov --- Completion/Unix/Command/_git | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index a24069a..9808040 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -464,6 +464,9 @@ _git-checkout () { (( $+functions[_git-cherry-pick] )) || _git-cherry-pick () { _arguments \ + '(- :)--quit[end revert or cherry-pick sequence]' \ + '(- :)--continue[resume revert or cherry-pick sequence]' \ + '(- :)--abort[cancel revert or cherry-pick sequence]' \ '(-e --edit --ff)'{-e,--edit}'[edit commit before committing the revert]' \ '(--ff)-x[append information about what commit was cherry-picked]' \ '(-m --mainline)'{-m,--mainline}'[specify mainline when cherry-picking a merge commit]:parent number' \ @@ -1248,6 +1251,9 @@ _git-reset () { (( $+functions[_git-revert] )) || _git-revert () { _arguments -w -S -s \ + '(- :)--quit[end revert or cherry-pick sequence]' \ + '(- :)--continue[resume revert or cherry-pick sequence]' \ + '(- :)--abort[cancel revert or cherry-pick sequence]' \ '(-e --edit --no-edit)'{-e,--edit}'[edit the commit before committing the revert]' \ '(-m --mainline)'{-m+,--mainline=}'[pick which parent is mainline]:parent number' \ '(-e --edit)--no-edit[do not edit the commit message]' \ -- 1.8.4