summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--Completion/Unix/Command/_git1
2 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 1f17f5f26..6fe3be9a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -9,6 +9,9 @@
 
 	* 33177: Completion/Unix/Command/_git: _git: fix typo in git-apply
 
+	* 33180: Completion/Unix/Command/_git: _git: add missing --3way
+	option
+
 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 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")]' \