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 25525
- From: "Nikolai Weibull" <now@xxxxxxxx>
- To: zsh-workers <zsh-workers@xxxxxxxxxx>
- Subject: Re: _git: Update __git_merge_strategies to work with new git.
- Date: Mon, 25 Aug 2008 01:37:06 +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:sender :to:subject:in-reply-to:mime-version:content-type :content-transfer-encoding:content-disposition:references :x-google-sender-auth; bh=Svir33bkoL6KBqgDboUTtsaG5jWIWitUdz0pNo6ft+I=; b=ktLDQdZM3qMyYTBgkpFlkg9EZRrqGD5KQNxWDcimwm4ITNfEj0Q+O1a3iecvfl+lcS ysh4tPcXQJxXLn3kwQm2WnJZse7/uvVwr1zBECZ5BS+xWRxIRIltc8I8f6u2PXUrt0sZ LrRxWL3SDfTbzA+vnP2/Cxisn4qSfYZ0NqziU=
- Domainkey-signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=message-id:date:from:sender:to:subject:in-reply-to:mime-version :content-type:content-transfer-encoding:content-disposition :references:x-google-sender-auth; b=myzOoF7YlEl3W4qHvFerzbyxuwfS6H84gxe7Sc5u21b+s1iXLtUw06tJoUz40TTvNV k9mNRqEKoeVSvlRHuTjCqY/vXsm7hdGZ/5Frg4NJqQt1x5vktb+8NBfT06dfrTW91A/O WjrfD+0FUlTZETET4wx/alCqMDQy92OXMWdkw=
- 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>
- Sender: nikolai.weibull@xxxxxxxxx
On Sun, Aug 24, 2008 at 21:12, Clint Adams <clint@xxxxxxx> wrote:
> 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?
There must have been a reason, but I can't remember why I excluded it.
Messages sorted by:
Reverse Date,
Date,
Thread,
Author