From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <zsh-workers-return-25463-mason-zsh=primenet.com.au@sunsite.dk>
Received: (qmail 3092 invoked from network); 16 Aug 2008 16:15:22 -0000
X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on f.primenet.com.au
X-Spam-Level: 
X-Spam-Status: No, score=-2.6 required=5.0 tests=AWL,BAYES_00,WEIRD_PORT
	autolearn=no version=3.2.5
Received: from news.dotsrc.org (HELO a.mx.sunsite.dk) (130.225.247.88)
  by ns1.primenet.com.au with SMTP; 16 Aug 2008 16:15:22 -0000
Received-SPF: none (ns1.primenet.com.au: domain at sunsite.dk does not designate permitted sender hosts)
Received: (qmail 48303 invoked from network); 16 Aug 2008 16:15:16 -0000
Received: from sunsite.dk (130.225.247.90)
  by a.mx.sunsite.dk with SMTP; 16 Aug 2008 16:15:16 -0000
Received: (qmail 551 invoked by alias); 16 Aug 2008 16:15:11 -0000
Mailing-List: contact zsh-workers-help@sunsite.dk; run by ezmlm
Precedence: bulk
X-No-Archive: yes
X-Seq: 25463
Received: (qmail 533 invoked from network); 16 Aug 2008 16:15:09 -0000
Received: from bifrost.dotsrc.org (130.225.254.106)
  by sunsite.dk with SMTP; 16 Aug 2008 16:15:09 -0000
Received: from cork.scru.org (cork.scru.org [209.20.67.2])
	by bifrost.dotsrc.org (Postfix) with ESMTPS id 95C05805A425
	for <zsh-workers@sunsite.dk>; Sat, 16 Aug 2008 18:15:05 +0200 (CEST)
Received: by cork.scru.org (Postfix, from userid 1000)
	id 5C0A3104087; Sat, 16 Aug 2008 16:15:03 +0000 (UTC)
Date: Sat, 16 Aug 2008 16:15:03 +0000
From: Clint Adams <clint@zsh.org>
To: Mikael Magnusson <mikachu@gmail.com>
Cc: zsh-workers <zsh-workers@sunsite.dk>
Subject: Re: Fix a typo in _git.
Message-ID: <20080816161503.GA2082@scru.org>
Mail-Followup-To: Mikael Magnusson <mikachu@gmail.com>,
	zsh-workers <zsh-workers@sunsite.dk>
References: <237967ef0808151656j7787f169g4b3456910e05bfc2@mail.gmail.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <237967ef0808151656j7787f169g4b3456910e05bfc2@mail.gmail.com>
User-Agent: Mutt/1.5.18 (2008-05-17)
X-Virus-Scanned: ClamAV 0.92.1/8051/Sat Aug 16 05:44:59 2008 on bifrost
X-Virus-Status: Clean

On Sat, Aug 16, 2008 at 01:56:36AM +0200, Mikael Magnusson wrote:
> http://git.mika.l3ib.org/?p=zsh-cvs.git;a=history;f=Completion/Unix/Command/_git;h=mika


From: Mikael Magnusson <mikachu@comhem.se>
Date: Tue, 22 Apr 2008 12:49:30 +0000 (+0200)
Subject: Add git completion for --base/-1, --ours/-2 and --theirs/-3.
X-Git-Url: http://git.mika.l3ib.org:1234/?p=zsh-cvs.git;a=commitdiff_plain;h=023a9db0b08cc9b63378c429508266725275a04b

Add git completion for --base/-1, --ours/-2 and --theirs/-3.
---

diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index cb04d62..e8efa52 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -55,6 +55,9 @@ diff_args=(
   '(-a --text)'{-a,--text}'[treat all files as text]'
   '(-b --ignore-space-change -w --ignore-all-space)'{-b,--ignore-space-change}'[ignore changes in amount of white space]'
   '(-b --ignore-space-change -w --ignore-all-space)'{-w,--ignore-all-space}'[ignore white space when comparing lines]'
+  '(-1 --base)'{-1,--base}'[diff against stage 1]'
+  '(-2 --ours)'{-2,--ours}'[diff against stage 2]'
+  '(-3 --theirs)'{-3,--theirs}'[diff against stage 3]'
   $abbrev_arg
   $nul_arg
   '--exit-code[report exit code 1 if differences, 0 otherwise]'