Re: Fix a typo in _git.

[Clint Adams <clint@xxxxxxx>]

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@xxxxxxxxx>
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]'