summary refs log tree commit diff
path: root/Completion
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2008-08-16 18:33:30 +0000
committerClint Adams <clint@users.sourceforge.net>2008-08-16 18:33:30 +0000
commit1ed1af98121e9b1c0e25e9b05160b0bc7e1dd0ee (patch)
tree518699935803ac468a64872d38085cf852a6cabf /Completion
parentc960e8a83bd618c52fcd3af752306c38aec0dac0 (diff)
downloadzsh-1ed1af98121e9b1c0e25e9b05160b0bc7e1dd0ee.tar.gz
zsh-1ed1af98121e9b1c0e25e9b05160b0bc7e1dd0ee.tar.xz
zsh-1ed1af98121e9b1c0e25e9b05160b0bc7e1dd0ee.zip
25465: patch from Mikael Magnusson to add more git-add and git-checkout options.
Diffstat (limited to 'Completion')
-rw-r--r--Completion/Unix/Command/_git7
1 files changed, 7 insertions, 0 deletions
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 4c1513a17..30cc7b2a0 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1298,6 +1298,10 @@ _git-add () {
     '-v[show files as they are added]' \
     '-f[allow adding otherwise ignored files]' \
     '(-i --interactive : -)'{-i,--interactive}'[add contents interactively to the index]' \
+    '(-p --patch : -)'{-p,--patch}'[like -i but go directly into patch mode for specified files]' \
+    '-u[Update only files git already knows about]' \
+    '--refresh[do not add files, but refresh their stat() info in the index]' \
+    '--ignore-errors[continue adding if an error occurs]' \
     '*:file:->files' && ret=0
 
   case $state in
@@ -1506,6 +1510,9 @@ _git-checkout () {
       '-q[suppress feedback messages]' \
       '-f[force a complete re-read]' \
       '-b[create a new branch based at given branch]: :__git_guard_branch-name' \
+      {-t,--track}'[set up configuration so pull merges from the start point]' \
+      '--no-track[override the branch.autosetupmerge configuration variable]' \
+      '-l[create the branch'\''s reflog]' \
       $new_branch_reflog_arg \
       '-m[3way merge current branch, working tree and new branch]' \
       '::branch:__git_revisions' \