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 25518
- 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 20:40:46 +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=TI+k38dIh+yVmpPhipT67ECWmozUOwThPD98+SPdp64=; b=kvPNZknM9Ys3TiYfGxkNGCKwPSH3GLLa42fLtj2O28J9ymaEZKWCAts6XKvVttCOOf NZKTEq7CmUoN+i2anqS+2wyO3GjK1ivPbzts9r12Or1PXQCiXSH/tIRCIOPZy61mtBeV RJrbXR4xEN5zwvJJdpku87DW++g4ddHUa4RgE=
- 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=uBWG9chKkOCNBPv2lIFQix0fPM8oWHzWK5YguVFf0ZHqRAl9/1W+go3PGv51DpBLlk ahk5g8RL1qE13LFSAKBJZimngwCFkcW9bIlP3nwUu+irTWoSUTwoClUQDvxrj9uymqU2 PM+mx7nWe3w6q6q5FmYdnQt4Fw41Nm1BKIKto=
- In-reply-to: <20080824163658.GA20363@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>
2008/8/24 Clint Adams <clint@xxxxxxx>:
> On Fri, Aug 22, 2008 at 05:41:39PM +0200, Mikael Magnusson wrote:
>> That doesn't grab the custom strategies line... How about this? Sort
>> of a hack though... :)
>>
>> ${(s: :)${${${${(f)"$(echo; git merge -s '' 2>&1)"}[(r)[Aa]vailable
>> strategies are: *,(r)]}%%.}##*: }}
>
> ${=${${(M)${(f)"$(git merge -s '' 2>&1)"}:#[Aa]vailable (custom )#strategies are: *}#[Aa]vailable (custom )#strategies are: }%.}
That works for me too.
--
Mikael Magnusson
Messages sorted by:
Reverse Date,
Date,
Thread,
Author