From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 14098 invoked from network); 16 Aug 2008 18:29:41 -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=AWL,BAYES_00,WEIRD_PORT autolearn=no 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; 16 Aug 2008 18:29:41 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 83747 invoked from network); 16 Aug 2008 18:29:33 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 16 Aug 2008 18:29:33 -0000 Received: (qmail 17139 invoked by alias); 16 Aug 2008 18:29:29 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 25465 Received: (qmail 17123 invoked from network); 16 Aug 2008 18:29:27 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 16 Aug 2008 18:29:27 -0000 Received: from cork.scru.org (cork.scru.org [209.20.67.2]) by bifrost.dotsrc.org (Postfix) with ESMTPS id 97076805A425 for ; Sat, 16 Aug 2008 20:29:22 +0200 (CEST) Received: by cork.scru.org (Postfix, from userid 1000) id C03A5104087; Sat, 16 Aug 2008 18:29:21 +0000 (UTC) Date: Sat, 16 Aug 2008 18:29:21 +0000 From: Clint Adams To: Mikael Magnusson Cc: zsh-workers Subject: Re: Fix a typo in _git. Message-ID: <20080816182921.GA4091@scru.org> Mail-Followup-To: Mikael Magnusson , zsh-workers References: <237967ef0808151656j7787f169g4b3456910e05bfc2@mail.gmail.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <237967ef0808151656j7787f169g4b3456910e05bfc2@mail.gmail.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Scanned: ClamAV 0.92.1/8051/Sat Aug 16 05:44:59 2008 on bifrost X-Virus-Status: Clean On Sat, Aug 16, 2008 at 01:56:36AM +0200, Mikael Magnusson wrote: > http://git.mika.l3ib.org/?p=zsh-cvs.git;a=history;f=Completion/Unix/Command/_git;h=mika From: Mikael Magnusson Date: Fri, 6 Jun 2008 02:31:04 +0000 (+0200) Subject: git-add and git-checkout options. X-Git-Url: http://git.mika.l3ib.org:1234/?p=zsh-cvs.git;a=commitdiff_plain;h=94a521f7ba1d3d21858727f4df21cc9c09c628a0 git-add and git-checkout options. --- diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index f1261ab..c946b29 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1298,6 +1298,10 @@ _git-add () { '-v[show files as they are added]' \ '-f[allow adding otherwise ignored files]' \ '(-i --interactive : -)'{-i,--interactive}'[add contents interactively to the index]' \ + '(-p --patch : -)'{-p,--patch}'[like -i but go directly into patch mode for specified files]' \ + '-u[Update only files git already knows about]' \ + '--refresh[do not add files, but refresh their stat() info in the index]' \ + '--ignore-errors[continue adding if an error occurs]' \ '*:file:->files' && ret=0 case $state in @@ -1507,6 +1511,9 @@ _git-checkout () { '-q[suppress feedback messages]' \ '-f[force a complete re-read]' \ '-b[create a new branch based at given branch]: :__git_guard_branch-name' \ + {-t,--track}'[set up configuration so pull merges from the start point]' \ + '--no-track[override the branch.autosetupmerge configuration variable]' \ + '-l[create the branch'\''s reflog]' \ $new_branch_reflog_arg \ '-m[3way merge current branch, working tree and new branch]' \ '::branch:__git_revisions' \