about summary refs log tree commit diff
path: root/Completion
diff options
context:
space:
mode:
authorØystein Walle <oystwa@gmail.com>2014-09-16 10:28:11 +0200
committerFrank Terbeck <ft@bewatermyfriend.org>2014-09-23 22:26:22 +0200
commit95a6d965c556807a7aa16490f92f48b77bf8b6ce (patch)
tree7fb0ee6e6314d4563c800130ee6acd9da774e21d /Completion
parent93702691ec6ba9b4f863c96c9ebade198990f702 (diff)
downloadzsh-95a6d965c556807a7aa16490f92f48b77bf8b6ce.tar.gz
zsh-95a6d965c556807a7aa16490f92f48b77bf8b6ce.tar.xz
zsh-95a6d965c556807a7aa16490f92f48b77bf8b6ce.zip
33180: _git: add missing --3way option
Diffstat (limited to 'Completion')
-rw-r--r--Completion/Unix/Command/_git1
1 files changed, 1 insertions, 0 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index fcfd3e151..c4e386b15 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -3986,6 +3986,7 @@ _git-apply () {
 
   _arguments -w -S -s \
     $apply_options \
+    '(--index --cached --reject)'{-3,--3way}'[fall back on 3-way merge if patch fails]' \
     '--stat[output diffstat for input (turns off "apply")]' \
     '--numstat[same as --stat but in decimal notation and complete pathnames (turns off "apply")]' \
     '--summary[output summary of git-diff extended headers (turns off "apply")]' \