From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 9754 invoked by alias); 16 Sep 2014 08:28:37 -0000 Mailing-List: contact zsh-workers-help@zsh.org; run by ezmlm Precedence: bulk X-No-Archive: yes List-Id: Zsh Workers List List-Post: List-Help: X-Seq: 33177 Received: (qmail 726 invoked from network); 16 Sep 2014 08:28:35 -0000 X-Spam-Checker-Version: SpamAssassin 3.3.2 (2011-06-06) 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,FREEMAIL_FROM,RCVD_IN_DNSWL_LOW autolearn=ham version=3.3.2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :in-reply-to:references; bh=PsUMI26pnkuFnVH1yMH1fnj0JXnB5Qnai2YnwH6C1so=; b=Z8nktcyCNJtwWrK+j+gKFT8ndEBflP/sMQYa0mprvKMBktNZQnv/aaGZSHqxM8/wh+ jufTwAWCMwJScKCq2ga6k5iXLc+FE/zpmxiQF7l/R+sAz7BaLyIQQOGKySV6fhKdYdVl nCkdxGvyQgFlE6uk5u1d3z4k+hqh4Vu0D1S2i/pu0Hsylu76k7D6H0jxX5TX4d7yvGTh 5BLbwtqIEd07MVaExCqHJFxFLKExlR3bWRUQbmpJ8Gzh7ayenuFa1ObiS0E2gwg7j+Pl UMWZfCRpBWUC58vLVXerb5UxSjTjVdUcmYSCeG1FuP77yyZaljJmyuTQZHC+rzHiutDk 2uPg== X-Received: by 10.152.29.129 with SMTP id k1mr9696685lah.81.1410856112902; Tue, 16 Sep 2014 01:28:32 -0700 (PDT) From: =?UTF-8?q?=C3=98ystein=20Walle?= To: zsh-workers@zsh.org Cc: =?UTF-8?q?=C3=98ystein=20Walle?= Subject: [PATCH 4/5] _git: fix typo in git-apply Date: Tue, 16 Sep 2014 10:28:10 +0200 Message-Id: <77123ba35db101a3e9450c9afab67975a39065bb.1410851605.git.oystwa@gmail.com> X-Mailer: git-send-email 2.1.0 In-Reply-To: References: In-Reply-To: References: --- Completion/Unix/Command/_git | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index d127190..fcfd3e1 100644 --- a/Completion/Unix/Command/_git +++ b/Completion/Unix/Command/_git @@ -3992,7 +3992,7 @@ _git-apply () { '--check[check if patches are applicable (turns off "apply")]' \ '( --cached)--index[make sure that patch is applicable to index]' \ '(--index )--cached[apply patches without touching working tree]' \ - '--build-face-ancestor[build temporary index for blobs with ambiguous origin]:index:_files' \ + '--build-fake-ancestor[build temporary index for blobs with ambiguous origin]:index:_files' \ '(-R --reverse)'{-R,--reverse}'[apply patches in reverse]' \ '-z[use NUL termination on output]' \ '--unidiff-zero[disable unified-diff-context check]' \ -- 2.1.0