From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-25520-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 15492 invoked from network); 24 Aug 2008 19:16:28 -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; 24 Aug 2008 19:16:28 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 71677 invoked from network); 24 Aug 2008 19:16:22 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 24 Aug 2008 19:16:22 -0000
Received: (qmail 20746 invoked by alias); 24 Aug 2008 19:16:17 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 25520
Received: (qmail 20734 invoked from network); 24 Aug 2008 19:16:17 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 24 Aug 2008 19:16:17 -0000
Received: from nf-out-0910.google.com (nf-out-0910.google.com [64.233.182.187])
	by bifrost.dotsrc.org (Postfix) with ESMTP id 152F48030846
	for <zsh-workers@sunsite.dk>; Sun, 24 Aug 2008 21:16:13 +0200 (CEST)
Received: by nf-out-0910.google.com with SMTP id g13so1029000nfb.11
        for <zsh-workers@sunsite.dk>; Sun, 24 Aug 2008 12:16:13 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
        d=gmail.com; s=gamma;
        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=nQMF3rMrr3ztntJB/pBKfHlcwn5RbNWsF5vURBmQfGo=;
        b=Aee29igiXRj4YRQ7OgSNOm705yYb7hhwq3NZDXgbvzprAdbcZu2ol8n9IRviipSaSF
         kX5Sl/K/neu6+s5O3tzufPAWD4xBjomJPkRtkRON1JJaEnC6E38xmJc/4c3shOgdHLl5
         /YmN6DsO/ZMYfvilouYn56aigqKkDMJcrOWts=
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=message-id:date:from:to:subject:in-reply-to:mime-version
         :content-type:content-transfer-encoding:content-disposition
         :references;
        b=w0GV7vka/DVOf65h3zHv5TOIITXWruRXNrnA7Gux/RLy8U5B0UHJXDjl6gYTVBSWAy
         6C0Tmdl+9KLDUqAUQqPeAXhY0FYPri6rmGoF6ajHi7sqLgeJp7s8xwrrLoWTCML1MXdm
         tGRp01h91Vo9iJd3rAs1mwvU8bimrLMPtFg9I=
Received: by 10.210.110.5 with SMTP id i5mr5377778ebc.2.1219605373764;
        Sun, 24 Aug 2008 12:16:13 -0700 (PDT)
Received: by 10.210.19.20 with HTTP; Sun, 24 Aug 2008 12:16:13 -0700 (PDT)
Message-ID: <237967ef0808241216t5a8e3b3t17756e52e15e3628@mail.gmail.com>
Date: Sun, 24 Aug 2008 21:16:13 +0200
From: "Mikael Magnusson" <mikachu@gmail.com>
To: zsh-workers <zsh-workers@sunsite.dk>
Subject: Re: _git: Update __git_merge_strategies to work with new git.
In-Reply-To: <20080824191244.GA23476@scru.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
References: <237967ef0808210443y542c4794v50c5ea0eb1a308f@mail.gmail.com>
	 <20080821122947.GA4065@scru.org>
	 <237967ef0808211319u42388b15w330c324e3f8043e@mail.gmail.com>
	 <20080822103622.GA31581@scru.org>
	 <237967ef0808220841x635d8180n7c1b46ab682c8869@mail.gmail.com>
	 <20080824163658.GA20363@scru.org>
	 <237967ef0808241140r20c09376wfcee421ac1db7e6b@mail.gmail.com>
	 <20080824191244.GA23476@scru.org>
X-Virus-Scanned: ClamAV 0.92.1/8082/Sun Aug 24 18:40:03 2008 on bifrost
X-Virus-Status: Clean

2008/8/24 Clint Adams <clint@zsh.org>:
> On Sun, Aug 24, 2008 at 08:40:46PM +0200, Mikael Magnusson wrote:
>> > ${=${${(M)${(f)"$(git merge -s '' 2>&1)"}:#[Aa]vailable (custom )#strategies are: *}#[Aa]vailable (custom )#strategies are: }%.}
>>
>> That works for me too.
>
> Do we know why the current function excludes "recur"? Should that be
> retained?

The git-bundled bash completion doesn't exclude it at any rate.

-- 
Mikael Magnusson