From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-35161-mason-zsh=primenet.com.au@zsh.org>
Received: (qmail 5383 invoked by alias); 16 May 2015 22:55:32 -0000
Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm
Precedence: bulk
X-No-Archive: yes
List-Id: Zsh Workers List <zsh-workers.zsh.org>
List-Post: <mailto:zsh-workers@zsh.org>
List-Help: <mailto:zsh-workers-help@zsh.org>
X-Seq: 35161
Received: (qmail 29623 invoked from network); 16 May 2015 22:55:31 -0000
X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.7 required=5.0 tests=BAYES_00,DKIM_SIGNED,
	DKIM_VALID,DKIM_VALID_AU,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H3,
	RCVD_IN_MSPIKE_WL autolearn=ham autolearn_force=no version=3.4.0
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
	daniel.shahaf.name; h=content-type:date:from:in-reply-to
	:message-id:mime-version:references:subject:to:x-sasl-enc
	:x-sasl-enc; s=mesmtp; bh=JAFUu1kJoLlpZI3+WrXitQ387Dg=; b=XvKYA3
	5HuDdg5Awhvmny2/TZ+XXQbpc/C2MPUM/3RGzE+7riLDrn/NiF9DqeJBDZtam1pi
	v9Gn5JavxhsTQVXDLfITz36AyjSfpxGa/oBLKte0oTb8N8RJVD5X31uurM66UYrq
	CuMllAI5VSlkMmDyO+15abaWHC03or2J6buIo=
DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=
	messagingengine.com; h=content-type:date:from:in-reply-to
	:message-id:mime-version:references:subject:to:x-sasl-enc
	:x-sasl-enc; s=smtpout; bh=JAFUu1kJoLlpZI3+WrXitQ387Dg=; b=Nss0z
	L4q5udm902JU4MsUwxfR4UXmpkAcn/wxgyeKAOUcTFwFdiJGcazeQo19dNBCit8G
	mYes2IvtE8yDKag2F4DYIy9oEH+L/uyZSA1twX4YV8uPaOW0RAq57D9PWaR8Az9w
	frgmCssAYvVKnFoHnhXDWKHMZwmWjZ06tgbDsA=
X-Sasl-enc: p45qN4ypD0mtDDkiSi3C1CBzN34j24zMvyM4ICHPcQ29 1431816929
Date: Sat, 16 May 2015 22:55:27 +0000
From: Daniel Shahaf <d.s@daniel.shahaf.name>
To: zsh-workers@zsh.org
Subject: Re: [PATCH 1/2] completion: git: split diff options for stages
 (--theirs, --ours etc)
Message-ID: <20150516225527.GI1976@tarsus.local2>
References: <f9059726c9c756ffcaf3ec45b6c27c2e8999376b.1382290245.git.oystwa@gmail.com>
 <1431096405-16016-1-git-send-email-genml+zsh-workers@thequod.de>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <1431096405-16016-1-git-send-email-genml+zsh-workers@thequod.de>
User-Agent: Mutt/1.5.21 (2010-09-15)

Daniel Hahler wrote on Fri, May 08, 2015 at 16:46:44 +0200:
> @@ -6214,14 +6218,20 @@ __git_setup_diff_options () {
> +    '(-c,--cc)'{-b,--cc}'[combined diff format for merge commits]'

This -b should be -c.  I'll fix.