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 25517
- From: Clint Adams <clint@xxxxxxx>
- To: Mikael Magnusson <mikachu@xxxxxxxxx>
- Subject: Re: _git: Update __git_merge_strategies to work with new git.
- Date: Sun, 24 Aug 2008 16:36:58 +0000
- Cc: zsh-workers <zsh-workers@xxxxxxxxxx>
- In-reply-to: <237967ef0808220841x635d8180n7c1b46ab682c8869@xxxxxxxxxxxxxx>
- Mail-followup-to: Mikael Magnusson <mikachu@xxxxxxxxx>, zsh-workers <zsh-workers@xxxxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- References: <237967ef0808210443y542c4794v50c5ea0eb1a308f@xxxxxxxxxxxxxx> <20080821122947.GA4065@xxxxxxxx> <237967ef0808211319u42388b15w330c324e3f8043e@xxxxxxxxxxxxxx> <20080822103622.GA31581@xxxxxxxx> <237967ef0808220841x635d8180n7c1b46ab682c8869@xxxxxxxxxxxxxx>
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: }%.}
Messages sorted by:
Reverse Date,
Date,
Thread,
Author