summary refs log tree commit diff
diff options
context:
space:
mode:
authorClint Adams <clint@users.sourceforge.net>2009-01-29 18:05:28 +0000
committerClint Adams <clint@users.sourceforge.net>2009-01-29 18:05:28 +0000
commitc1f0bf30a3f1f55ce822cc4f1b0ef73e24d5e02f (patch)
tree03fec3bc3188bb44894598648c1549dfe93ff2bf
parent218a7258b43f62cf25b1516cd4144388c0cce746 (diff)
downloadzsh-c1f0bf30a3f1f55ce822cc4f1b0ef73e24d5e02f.tar.gz
zsh-c1f0bf30a3f1f55ce822cc4f1b0ef73e24d5e02f.tar.xz
zsh-c1f0bf30a3f1f55ce822cc4f1b0ef73e24d5e02f.zip
Ingmar Vanhassel: 26471: update "git rebase" completion.
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Command/_git2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 231f86ac7..37db6266b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -28,6 +28,8 @@
 	"git clone --verbose".
 	* Ingmar Vanhassel: 26470: Completion/Unix/Command/_git: update
 	"git svn" completion.
+	* Ingmar Vanhassel: 26471: Completion/Unix/Command/_git: update
+	"git rebase" completion.
 
 2009-01-29  Peter Stephenson  <pws@csr.com>
 
@@ -11059,5 +11061,5 @@
 
 *****************************************************
 * This is used by the shell to define $ZSH_PATCHLEVEL
-* $Revision: 1.4541 $                         
+* $Revision: 1.4542 $                         
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 176492c62..f8f0c3a63 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1880,8 +1880,10 @@ _git-rebase () {
       '(-m --merge)'{-m,--merge}'[use merging strategies to rebase]' \
       '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies' \
       $verbose_arg \
+      '--no-verify[bypass the pre-rebase hook]' \
       '-C-[ensure that given lines of surrounding context match]: :_guard "[[\:digit\:]]##" "lines of context"' \
       '(-i --interactive)'{-i,--interactive}'[make a list of commits to be rebased and open in $EDITOR]' \
+      '(-p --preserve-merges)'{-p,--preserve-merges}'[try to recreate merges instead of ignoring them]' \
       ':upstream branch:__git_revisions' \
       '::working branch:__git_revisions' && ret=0
   fi