diff options
| author | Øystein Walle <oystwa@gmail.com> | 2014-09-16 10:28:10 +0200 |
|---|---|---|
| committer | Frank Terbeck <ft@bewatermyfriend.org> | 2014-09-23 22:26:21 +0200 |
| commit | 93702691ec6ba9b4f863c96c9ebade198990f702 (patch) | |
| tree | 289f5c834a00f610a9557a805df38950033c968e | |
| parent | d338cc539572fb8c9a0a581936d542e08d7e9b1e (diff) | |
| download | zsh-93702691ec6ba9b4f863c96c9ebade198990f702.tar.gz zsh-93702691ec6ba9b4f863c96c9ebade198990f702.tar.xz zsh-93702691ec6ba9b4f863c96c9ebade198990f702.zip | |
33177: _git: fix typo in git-apply
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | Completion/Unix/Command/_git | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog index b3abac7fd..1f17f5f26 100644 --- a/ChangeLog +++ b/ChangeLog @@ -7,6 +7,8 @@ * 33178: Completion/Unix/Command/_git: _git: updates for Git 2.1.0 + * 33177: Completion/Unix/Command/_git: _git: fix typo in git-apply + 2014-09-23 Peter Stephenson <p.w.stephenson@ntlworld.com> * unposted: NEWS: more minor tweaks. diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git index d127190af..fcfd3e151 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]' \ |