From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 4989 invoked from network); 25 Sep 2007 17:34:26 -0000 X-Spam-Checker-Version: SpamAssassin 3.2.3 (2007-08-08) 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.3 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by ns1.primenet.com.au with SMTP; 25 Sep 2007 17:34:26 -0000 Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts) Received: (qmail 65732 invoked from network); 25 Sep 2007 17:34:19 -0000 Received: from sunsite.dk (130.225.247.90) by a.mx.sunsite.dk with SMTP; 25 Sep 2007 17:34:19 -0000 Received: (qmail 23518 invoked by alias); 25 Sep 2007 17:34:17 -0000 Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm Precedence: bulk X-No-Archive: yes X-Seq: 23830 Received: (qmail 23502 invoked from network); 25 Sep 2007 17:34:16 -0000 Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88) by sunsite.dk with SMTP; 25 Sep 2007 17:34:16 -0000 Received: (qmail 65471 invoked from network); 25 Sep 2007 17:34:16 -0000 Received: from wr-out-0506.google.com (64.233.184.232) by a.mx.sunsite.dk with SMTP; 25 Sep 2007 17:34:10 -0000 Received: by wr-out-0506.google.com with SMTP id c48so694457wra for ; Tue, 25 Sep 2007 10:34:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=beta; h=domainkey-signature:received:received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; bh=I61ks3BSQ+b4//cFbZPvkEt9CbYhBYR0iqk56cb0RyU=; b=tPDGJHNMGzx2uxPgHR2Fd3rFYpfjtFrYlphr3T1Ob/HMpCVO4NqKPjN6udBJ8xxReIP0eUI8F7xKCNLYpXeKAbWimJ+5pEL/JYr6iGR0qWIK4+PXAQcRO1tMaoBqIMo07ELdGhuvy9+MiwpEzSJDj6YUtQBnz1zJLH4RY5K6lVA= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=beta; h=received:message-id:date:from:to:subject:in-reply-to:mime-version:content-type:content-transfer-encoding:content-disposition:references; b=ny0T+y+azLf53U8ToRoJSJT+cASoBdNqbcStcCHOfh0TiV6zp2FzB/U7npZxkK19mmRQblqf5UbdoBW8qVeQ1awAtox4/aHY6z7Jy50Ke7w95ArvHEBdCi/HlaijOre/ApKrI6eSr1W+SOwDORt0rqZYtvZr72fxw5FwIC9ZVBc= Received: by 10.142.239.11 with SMTP id m11mr1839884wfh.1190741647893; Tue, 25 Sep 2007 10:34:07 -0700 (PDT) Received: by 10.142.86.21 with HTTP; Tue, 25 Sep 2007 10:34:07 -0700 (PDT) Message-ID: <237967ef0709251034u4f1edc29i4ecadbed57bee1d4@mail.gmail.com> Date: Tue, 25 Sep 2007 19:34:07 +0200 From: "Mikael Magnusson" To: zsh-workers@sunsite.dk Subject: Re: PATCH: _git (large) In-Reply-To: <20070925155927.GA22272@scowler.net> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit Content-Disposition: inline References: <20070925155927.GA22272@scowler.net> On 25/09/2007, Clint Adams wrote: > This reduces the diff between ours and Nikolai's _git to about 21K. > Hopefully it doesn't break everything. When I do git-merge , I get the following (which I also get when I use _git straight from Nikolai's repo): _arguments:comparguments:303: invalid rest argument definition: *{-s,--strategy=-}[use given merge strategy]:merge strategy:__git_merge_strategies and nothing is completed. -- Mikael Magnusson