mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2025-10-22 16:20:23 +02:00
Code Releases Activity

31726: _git: add few more arguments for cherry-pick and revert

Browse source 
Signed-off-by: Luka Perkov <luka@openwrt.org>
This commit is contained in:
Luka Perkov 2013-09-14 01:34:13 +02:00 • committed by Frank Terbeck
parent 99e3aa58da
commit 075ad840d6
2 changed files with 9 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

3
ChangeLog
View file

@ -3,6 +3,9 @@
* 31723: Completion/Unix/Command/_systemd: _systemd: add more
system commands
* 31726: Completion/Unix/Command/_git: _git: add few more
arguments for cherry-pick and revert
2013-09-10 Barton E. Schaefer <schaefer@zsh.org>
* 31714: Completion/Zsh/Command/_cd: handle ".." properly when

6
Completion/Unix/Command/_git
View file

@ -464,6 +464,9 @@ _git-checkout () {
(( $+functions[_git-cherry-pick] )) ||
_git-cherry-pick () {
_arguments \
'(- :)--quit[end revert or cherry-pick sequence]' \
'(- :)--continue[resume revert or cherry-pick sequence]' \
'(- :)--abort[cancel revert or cherry-pick sequence]' \
'(-e --edit --ff)'{-e,--edit}'[edit commit before committing the revert]' \
'(--ff)-x[append information about what commit was cherry-picked]' \
'(-m --mainline)'{-m,--mainline}'[specify mainline when cherry-picking a merge commit]:parent number' \
@ -1248,6 +1251,9 @@ _git-reset () {
(( $+functions[_git-revert] )) ||
_git-revert () {
_arguments -w -S -s \
'(- :)--quit[end revert or cherry-pick sequence]' \
'(- :)--continue[resume revert or cherry-pick sequence]' \
'(- :)--abort[cancel revert or cherry-pick sequence]' \
'(-e --edit --no-edit)'{-e,--edit}'[edit the commit before committing the revert]' \
'(-m --mainline)'{-m+,--mainline=}'[pick which parent is mainline]:parent number' \
'(-e --edit)--no-edit[do not edit the commit message]' \