From: "Nikolai Weibull" <now@bitwi.se>
To: zsh-workers <zsh-workers@sunsite.dk>
Subject: Re: _git: Update __git_merge_strategies to work with new git.
Date: Mon, 25 Aug 2008 01:37:06 +0200 [thread overview]
Message-ID: <dbfc82860808241637p540fd879m4ea93fec1536d964@mail.gmail.com> (raw)
In-Reply-To: <20080824191244.GA23476@scru.org>
On Sun, Aug 24, 2008 at 21:12, Clint Adams <clint@zsh.org> 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.
prev parent reply other threads:[~2008-08-24 23:37 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2008-08-21 11:43 Mikael Magnusson
2008-08-21 12:29 ` Clint Adams
2008-08-21 20:19 ` Mikael Magnusson
2008-08-22 10:36 ` Clint Adams
2008-08-22 15:41 ` Mikael Magnusson
2008-08-24 16:36 ` Clint Adams
2008-08-24 18:40 ` Mikael Magnusson
2008-08-24 19:12 ` Clint Adams
2008-08-24 19:16 ` Mikael Magnusson
2008-08-24 19:42 ` Clint Adams
2008-08-24 19:52 ` Mikael Magnusson
2008-08-24 23:37 ` Nikolai Weibull [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=dbfc82860808241637p540fd879m4ea93fec1536d964@mail.gmail.com \
--to=now@bitwi.se \
--cc=zsh-workers@sunsite.dk \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://git.vuxu.org/mirror/zsh/
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).