From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 6751 invoked from network); 29 Jan 2009 12:23:07 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on f.primenet.com.au X-Spam-Level: X-Spam-Status: No, score=-2.6 required=5.0 tests=BAYES_00 autolearn=ham version=3.2.5 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 29 Jan 2009 12:23:07 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 69805 invoked from network); 29 Jan 2009 12:22:32 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 29 Jan 2009 12:22:32 -0000 Received: (qmail 9430 invoked by alias); 29 Jan 2009 12:22:01 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 26471 Received: (qmail 9342 invoked from network); 29 Jan 2009 12:21:59 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 29 Jan 2009 12:21:59 -0000 Received: from bach.exherbo.org (bach.exherbo.org [78.47.197.147]) by bifrost.dotsrc.org (Postfix) with ESMTPS id 0B12C802720F for ; Thu, 29 Jan 2009 13:21:56 +0100 (CET) Received: from ingmar by bach.exherbo.org with local (Exim 4.69) (envelope-from ) id 1LSVu3-0000LM-71; Thu, 29 Jan 2009 12:21:51 +0000 From: Ingmar Vanhassel To: Zsh Hackers' List Cc: Ingmar Vanhassel Subject: [PATCH] Update "git rebase" completions. Date: Thu, 29 Jan 2009 12:21:49 +0000 Message-Id: <1233231710-1204-8-git-send-email-ingmar@exherbo.org> X-Mailer: git-send-email 1.6.0.1 In-Reply-To: <1233231710-1204-7-git-send-email-ingmar@exherbo.org> References: <1233231710-1204-1-git-send-email-ingmar@exherbo.org> <1233231710-1204-2-git-send-email-ingmar@exherbo.org> <1233231710-1204-3-git-send-email-ingmar@exherbo.org> <1233231710-1204-4-git-send-email-ingmar@exherbo.org> <1233231710-1204-5-git-send-email-ingmar@exherbo.org> <1233231710-1204-6-git-send-email-ingmar@exherbo.org> <1233231710-1204-7-git-send-email-ingmar@exherbo.org> X-Virus-Scanned: ClamAV 0.92.1/8918/Thu Jan 29 12:42:19 2009 on bifrost X-Virus-Status: Clean --- Completion/Unix/Command/_git | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index cf69ce8..1097611 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1887,8 +1887,10 @@ _git-rebase () { '(-m --merge)'{-m,--merge}'[use merging strategies to rebase]' \ '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies' \ $verbose_arg \ + '--no-verify[bypass the pre-rebase hook]' \ '-C-[ensure that given lines of surrounding context match]: :_guard "[[\:digit\:]]##" "lines of context"' \ '(-i --interactive)'{-i,--interactive}'[make a list of commits to be rebased and open in $EDITOR]' \ + '(-p --preserve-merges)'{-p,--preserve-merges}'[try to recreate merges instead of ignoring them]' \ ':upstream branch:__git_revisions' \ '::working branch:__git_revisions' && ret=0 fi -- 1.6.0.1