From: "Øystein Walle" <oystwa@gmail.com>
To: zsh-workers@zsh.org
Cc: "Øystein Walle" <oystwa@gmail.com>
Subject: [PATCH 4/5] _git: fix typo in git-apply
Date: Tue, 16 Sep 2014 10:28:10 +0200 [thread overview]
Message-ID: <77123ba35db101a3e9450c9afab67975a39065bb.1410851605.git.oystwa@gmail.com> (raw)
In-Reply-To: <cover.1410851605.git.oystwa@gmail.com>
In-Reply-To: <cover.1410851605.git.oystwa@gmail.com>
---
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
next prev parent reply other threads:[~2014-09-16 8:28 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-16 8:28 [PATCH 0/5] Git coompletion updates and fixes Øystein Walle
2014-09-16 8:28 ` [PATCH] Fun! Øystein Walle
2014-09-16 8:28 ` [PATCH 1/5] _git: updates for Git 2.0.0 Øystein Walle
2014-09-16 8:28 ` [PATCH 2/5] _git: Add missing --list to git-tag Øystein Walle
2014-09-16 8:28 ` [PATCH 3/5] _git: updates for Git 2.1.0 Øystein Walle
2014-09-16 8:28 ` Øystein Walle [this message]
2014-09-16 8:28 ` [PATCH 5/5] _git: add missing --3way option Øystein Walle
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=77123ba35db101a3e9450c9afab67975a39065bb.1410851605.git.oystwa@gmail.com \
--to=oystwa@gmail.com \
--cc=zsh-workers@zsh.org \
/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).