From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 5556 invoked from network); 28 Aug 2008 13:39:12 -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; 28 Aug 2008 13:39:12 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 27572 invoked from network); 28 Aug 2008 13:38:52 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 28 Aug 2008 13:38:52 -0000 Received: (qmail 9825 invoked by alias); 28 Aug 2008 13:38:45 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 25537 Received: (qmail 9815 invoked from network); 28 Aug 2008 13:38:44 -0000 Received: from bifrost.dotsrc.org (130.225.254.106) by sunsite.dk with SMTP; 28 Aug 2008 13:38:44 -0000 Received: from mta-2.ms.rz.rwth-aachen.de (mta-2.ms.rz.RWTH-Aachen.DE [134.130.7.73]) by bifrost.dotsrc.org (Postfix) with ESMTPS id 1AA908058F4D for ; Thu, 28 Aug 2008 15:38:32 +0200 (CEST) Received: from ironport-out-2.rz.rwth-aachen.de ([134.130.3.59]) by mta-2.ms.rz.RWTH-Aachen.de (Sun Java System Messaging Server 6.2-8.04 (built Feb 28 2007)) with ESMTP id <0K6B005HYCK8PZB0@mta-2.ms.rz.RWTH-Aachen.de> for zsh-workers@sunsite.dk; Thu, 28 Aug 2008 15:38:32 +0200 (CEST) Received: from relay.rwth-aachen.de ([134.130.3.1]) by ironport-in-2.rz.rwth-aachen.de with ESMTP; Thu, 28 Aug 2008 15:38:32 +0200 Received: from fsst.voodoo.lan ([212.117.84.217]) by relay.rwth-aachen.de (8.13.7/8.13.3/1) with ESMTP id m7SDcWcR011657 for ; Thu, 28 Aug 2008 15:38:32 +0200 (MEST) Received: from hawk by fsst.voodoo.lan with local (Exim 4.69) (envelope-from ) id 1KYhhO-0003mV-Qv for zsh-workers@sunsite.dk; Thu, 28 Aug 2008 15:38:07 +0200 Date: Thu, 28 Aug 2008 15:38:06 +0200 From: Frank Terbeck Subject: PATCH: Add --abort to options for 'git am' in _git To: zsh workers Mail-followup-to: zsh workers Message-id: <20080828133805.GD6330@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,286,1217800800"; d="scan'208";a="53185229" User-Agent: Mutt/1.5.18 (2008-05-17) X-Virus-Scanned: ClamAV 0.92.1/8106/Thu Aug 28 14:06:23 2008 on bifrost X-Virus-Status: Clean Index: Completion/Unix/Command/_git =================================================================== RCS file: /cvsroot/zsh/zsh/Completion/Unix/Command/_git,v retrieving revision 1.89 diff -u -r1.89 _git --- Completion/Unix/Command/_git 24 Aug 2008 19:48:09 -0000 1.89 +++ Completion/Unix/Command/_git 28 Aug 2008 13:33:14 -0000 @@ -1354,6 +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.]' \ '--binary[pass "--allow-binary-replacement" to "git-apply"]' \ '--dotest=-[use given directory as working area instead of .dotest]:directory:_directories' \ '--interactive[apply patches interactively]' \