about summary refs log tree commit diff
path: root/Completion/Unix/Command
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-08-16 17:56:15 +0000
committerClint Adams <clint@users.sourceforge.net>2008-08-16 17:56:15 +0000
commit71b215074ad70ad63f076cb2b1fa306ee98f1128 (patch)
tree74d7b35691acbd0d39b744ff42eeb6d1313d2680 /Completion/Unix/Command
parent9a9759e3407e89a1abe690f66bef90788b934628 (diff)
downloadzsh-71b215074ad70ad63f076cb2b1fa306ee98f1128.tar.gz
zsh-71b215074ad70ad63f076cb2b1fa306ee98f1128.tar.xz
zsh-71b215074ad70ad63f076cb2b1fa306ee98f1128.zip
25463: patch to add git completion for --base/-1, --ours/-2 and --theirs/-3, from Mikael Magnusson.
Diffstat (limited to 'Completion/Unix/Command')
-rw-r--r--Completion/Unix/Command/_git3
1 files changed, 3 insertions, 0 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index cb04d62ce..e8efa520d 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -55,6 +55,9 @@ diff_args=(
   '(-a --text)'{-a,--text}'[treat all files as text]'
   '(-b --ignore-space-change -w --ignore-all-space)'{-b,--ignore-space-change}'[ignore changes in amount of white space]'
   '(-b --ignore-space-change -w --ignore-all-space)'{-w,--ignore-all-space}'[ignore white space when comparing lines]'
+  '(-1 --base)'{-1,--base}'[diff against stage 1]'
+  '(-2 --ours)'{-2,--ours}'[diff against stage 2]'
+  '(-3 --theirs)'{-3,--theirs}'[diff against stage 3]'
   $abbrev_arg
   $nul_arg
   '--exit-code[report exit code 1 if differences, 0 otherwise]'