Zsh Mailing List Archive
Messages sorted by:
Reverse Date,
Date,
Thread,
Author
[PATCH] Update "git rebase" completions.
- X-seq: zsh-workers 26471
- From: Ingmar Vanhassel <ingmar@xxxxxxxxxxx>
- To: Zsh Hackers' List <zsh-workers@xxxxxxxxxx>
- Subject: [PATCH] Update "git rebase" completions.
- Date: Thu, 29 Jan 2009 12:21:49 +0000
- Cc: Ingmar Vanhassel <ingmar@xxxxxxxxxxx>
- In-reply-to: <1233231710-1204-7-git-send-email-ingmar@xxxxxxxxxxx>
- Mailing-list: contact zsh-workers-help@xxxxxxxxxx; run by ezmlm
- References: <1233231710-1204-1-git-send-email-ingmar@xxxxxxxxxxx> <1233231710-1204-2-git-send-email-ingmar@xxxxxxxxxxx> <1233231710-1204-3-git-send-email-ingmar@xxxxxxxxxxx> <1233231710-1204-4-git-send-email-ingmar@xxxxxxxxxxx> <1233231710-1204-5-git-send-email-ingmar@xxxxxxxxxxx> <1233231710-1204-6-git-send-email-ingmar@xxxxxxxxxxx> <1233231710-1204-7-git-send-email-ingmar@xxxxxxxxxxx>
---
Completion/Unix/Command/_git | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index cf69ce8..1097611 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -1887,8 +1887,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
--
1.6.0.1
Messages sorted by:
Reverse Date,
Date,
Thread,
Author