From c1f0bf30a3f1f55ce822cc4f1b0ef73e24d5e02f Mon Sep 17 00:00:00 2001 From: Clint Adams Date: Thu, 29 Jan 2009 18:05:28 +0000 Subject: Ingmar Vanhassel: 26471: update "git rebase" completion. --- Completion/Unix/Command/_git | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Completion') 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 -- cgit 1.4.1