From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 26199 invoked from network); 30 Aug 2008 09:26:57 -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; 30 Aug 2008 09:26:57 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 65378 invoked from network); 30 Aug 2008 09:26:48 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 30 Aug 2008 09:26:48 -0000 Received: (qmail 6372 invoked by alias); 30 Aug 2008 09:26:42 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 25551 Received: (qmail 6353 invoked from network); 30 Aug 2008 09:26:40 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 30 Aug 2008 09:26:40 -0000 Received: from mta-1.ms.rz.rwth-aachen.de (mta-1.ms.rz.RWTH-Aachen.DE [134.130.7.72]) by bifrost.dotsrc.org (Postfix) with ESMTPS id 65FF0801E2B4 for ; Sat, 30 Aug 2008 11:26:36 +0200 (CEST) Received: from ironport-out-1.rz.rwth-aachen.de ([134.130.3.58]) by mta-1.ms.rz.RWTH-Aachen.de (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) with ESMTP id <0K6E007NHQ8CRAD0@mta-1.ms.rz.RWTH-Aachen.de> for zsh-workers@sunsite.dk; Sat, 30 Aug 2008 11:26:36 +0200 (CEST) Received: from relay.rwth-aachen.de ([134.130.3.1]) by ironport-in-1.rz.rwth-aachen.de with ESMTP; Sat, 30 Aug 2008 11:26:36 +0200 Received: from fsst.voodoo.lan ([212.117.84.86]) by relay.rwth-aachen.de (8.13.7/8.13.3/1) with ESMTP id m7U9QaZW024205 for ; Sat, 30 Aug 2008 11:26:36 +0200 (MEST) Received: from hawk by fsst.voodoo.lan with local (Exim 4.69) (envelope-from ) id 1KZMiF-0004CS-RN for zsh-workers@sunsite.dk; Sat, 30 Aug 2008 11:25:43 +0200 Date: Sat, 30 Aug 2008 11:25:43 +0200 From: Frank Terbeck Subject: Re: PATCH: Add --abort to options for 'git am' in _git In-reply-to: <237967ef0808292246i6dd8eb70q2c2a9050b107eb26@mail.gmail.com> To: zsh workers Mail-followup-to: zsh workers Message-id: <20080830092543.GO6330@fsst.voodoo.lan> MIME-version: 1.0 Content-type: text/plain; charset=iso-8859-1 Content-transfer-encoding: 7BIT Content-disposition: inline X-IronPort-AV: E=Sophos;i="4.32,296,1217800800"; d="scan'208";a="81278937" References: <20080828133805.GD6330@fsst.voodoo.lan> <237967ef0808292246i6dd8eb70q2c2a9050b107eb26@mail.gmail.com> User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Scanned: ClamAV 0.92.1/8120/Sat Aug 30 05:43:49 2008 on bifrost X-Virus-Status: Clean Mikael Magnusson : [...] > A very minor nit I just noticed when I updated cvs, none of the other help > texts end with a period. Yeah, damn. I guess removing the dot in the sandbox of a person with commit access is quicker than applying this patch, but anyway: :-) Index: Completion/Unix/Command/_git =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v retrieving revision 1.92 diff -u -r1.92 _git --- Completion/Unix/Command/_git 29 Aug 2008 02:39:21 -0000 1.92 +++ Completion/Unix/Command/_git 30 Aug 2008 09:20:43 -0000 @@ -1354,7 +1354,7 @@ _git-am () { _arguments \ '--3way[use 3-way merge if patch does not apply cleanly]' \ - '--abort[restore the original branch and abort the patching operation.]' \ + '--abort[restore the original branch and abort the patching operation]' \ '--binary[pass "--allow-binary-replacement" to "git-apply"]' \ '--dotest=-[use given directory as working area instead of .dotest]:directory:_directories' \ '--interactive[apply patches interactively]' \