Zsh Mailing List Archive
Messages sorted by: Reverse Date, Date, Thread, Author

Re: _git: Update __git_merge_strategies to work with new git.



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