mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-09-26 05:51:08 +02:00
Code Releases Activity

Ingmar Vanhassel: 26471: update "git rebase" completion.

Browse source
This commit is contained in:
Clint Adams 2009-01-29 18:05:28 +00:00
parent 218a7258b4
commit c1f0bf30a3
2 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -28,6 +28,8 @@
"git clone --verbose". "git clone --verbose".
* Ingmar Vanhassel: 26470: Completion/Unix/Command/_git: update * Ingmar Vanhassel: 26470: Completion/Unix/Command/_git: update
"git svn" completion. "git svn" completion.
* Ingmar Vanhassel: 26471: Completion/Unix/Command/_git: update
"git rebase" completion.
2009-01-29 Peter Stephenson <pws@csr.com> 2009-01-29 Peter Stephenson <pws@csr.com>
@ -11059,5 +11061,5 @@
***************************************************** *****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL * This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.4541 $ * $Revision: 1.4542 $
***************************************************** *****************************************************

2
Completion/Unix/Command/_git
View file

@ -1880,8 +1880,10 @@ _git-rebase () {
'(-m --merge)'{-m,--merge}'[use merging strategies to rebase]' \ '(-m --merge)'{-m,--merge}'[use merging strategies to rebase]' \
'*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies' \ '*'{-s,--strategy=-}'[use given merge strategy]:merge strategy:__git_merge_strategies' \
$verbose_arg \ $verbose_arg \
'--no-verify[bypass the pre-rebase hook]' \
'-C-[ensure that given lines of surrounding context match]: :_guard "[[\:digit\:]]##" "lines of context"' \ '-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]' \ '(-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' \ ':upstream branch:__git_revisions' \
'::working branch:__git_revisions' && ret=0 '::working branch:__git_revisions' && ret=0
fi fi