Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
Re: _git: Update __git_merge_strategies to work with new git.
- X-seq: zsh-workers 25520
- From: "Mikael Magnusson" <mikachu@xxxxxxxxx>
- To: zsh-workers <zsh-workers@xxxxxxxxxx>
- Subject: Re: _git: Update __git_merge_strategies to work with new git.
- Date: Sun, 24 Aug 2008 21:16:13 +0200
- 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=
- In-reply-to: <20080824191244.GA23476@xxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- References: <237967ef0808210443y542c4794v50c5ea0eb1a308f@xxxxxxxxxxxxxx> <20080821122947.GA4065@xxxxxxxx> <237967ef0808211319u42388b15w330c324e3f8043e@xxxxxxxxxxxxxx> <20080822103622.GA31581@xxxxxxxx> <237967ef0808220841x635d8180n7c1b46ab682c8869@xxxxxxxxxxxxxx> <20080824163658.GA20363@xxxxxxxx> <237967ef0808241140r20c09376wfcee421ac1db7e6b@xxxxxxxxxxxxxx> <20080824191244.GA23476@xxxxxxxx>
2008/8/24 Clint Adams <clint@xxxxxxx>:
> 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
Messages sorted by:
Reverse Date,
Date,
Thread,
Author