From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 13131 invoked from network); 31 Mar 2009 22:28:17 -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 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; 31 Mar 2009 22:28:17 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 29980 invoked from network); 31 Mar 2009 22:28:05 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 31 Mar 2009 22:28:05 -0000 Received: (qmail 14241 invoked by alias); 31 Mar 2009 22:27:56 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 26800 Received: (qmail 14222 invoked from network); 31 Mar 2009 22:27:54 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 31 Mar 2009 22:27:54 -0000 Received: from zucker.schokokeks.org (zucker.schokokeks.org [78.46.69.5]) by bifrost.dotsrc.org (Postfix) with ESMTPS id 310278026E27 for ; Wed, 1 Apr 2009 00:27:50 +0200 (CEST) Received: from localhost (p5494F1E7.dip.t-dialin.net [::ffff:84.148.241.231]) (AUTH: PLAIN simon@ruderich.org, TLS: TLSv1/SSLv3,128bits,AES128-SHA) by zucker.schokokeks.org with esmtp; Wed, 01 Apr 2009 00:27:49 +0200 id 0000000000018027.0000000049D298E5.00002060 Date: Wed, 1 Apr 2009 00:27:57 +0200 From: Simon Ruderich To: zsh-workers@sunsite.dk Subject: Re: [PATCH] git add -p file completion Message-ID: <20090331222757.GB14879@ruderich.org> References: <20090331160447.GA29762@ruderich.org> MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8; x-action=pgp-signed Content-Disposition: inline Content-Transfer-Encoding: 8bit In-Reply-To: User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Scanned: ClamAV 0.92.1/9189/Tue Mar 31 23:37:49 2009 on bifrost X-Virus-Status: Clean -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA1 On Tue, Mar 31, 2009 at 08:24:17PM +0200, Nikolai Weibull wrote: > On Tue, Mar 31, 2009 at 18:04, Simon Ruderich wrote: > >> - -    '(-p --patch : -)'{-p,--patch}'[like -i but go directly into patch mode for specified files]' \ >> +    '(-p --patch)'{-p,--patch}'[like -i but go directly into patch mode for specified files]' \ > >> By the way, is the usage of : - documented somewhere in the >> completion man page? I couldn't find it. > > Yes, just search for _arguments and read up on it. Thanks, found it. > By the way, -A and -u are mutually exclusive. Care to create a patch > for that as well? This should work (I hope), contains the other patch as well: diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index 8c414b8..534307a 100644 - --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -1331,9 +1332,9 @@ _git-add () { '(-v --verbose)'{-v,--verbose}'[show files as they are added]' \ '(-f --force)'{-f,--force}'[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)'{-u,--update}'[update only files git already knows about]' \ - - '(-A --all)'{-A,--all}'[act as both add . and add -u]' \ + '(-p --patch)'{-p,--patch}'[like -i but go directly into patch mode for specified files]' \ + '(-u --update -A --all)'{-u,--update}'[update only files git already knows about]' \ + '(-A --all -u --update)'{-A,--all}'[act as both add . and add -u]' \ '(-N --intent-to-add)'{-N,--intent-to-add}'[record only that the path will be added later]' \ '--refresh[do not add files, but refresh their stat() info in the index]' \ '--ignore-errors[continue adding if an error occurs]' \ Simon - -- + privacy is necessary + using http://gnupg.org + public key id: 0x6115F804EFB33229 -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.9 (GNU/Linux) iEYEARECAAYFAknSmO0ACgkQYRX4BO+zMinoDACgyxiYWew4BJnN/b06heEtrcGW sLEAnR8gqf2wZ2vvnkygfdbKIobL5AR0 =pozu -----END PGP SIGNATURE-----