mirrors/zsh
1
0
Fork 0
mirror of git://git.code.sf.net/p/zsh/code synced 2026-01-02 08:21:09 +01:00
Code Releases Activity

30317: complete git merge --ff-only

Browse source
This commit is contained in:
Clint Adams 2012-03-06 02:36:12 +00:00
parent 942e163807
commit 45090b19df
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -6,6 +6,8 @@
* 30316: Completion/Unix/Type/_pdf: complete .pdf for evince and
epdfview.
* 30317: Completion/Unix/Command/_git: complete git merge --ff-only
2012-03-05 Peter Stephenson <pws@csr.com>
* 30307 plus change suggested by Wayne in 30309: configure.ac,
@ -16070,5 +16072,5 @@
*****************************************************
* This is used by the shell to define $ZSH_PATCHLEVEL
* $Revision: 1.5603 $
* $Revision: 1.5604 $
*****************************************************

1
Completion/Unix/Command/_git
View file

@ -5753,6 +5753,7 @@ __git_setup_merge_options () {
'(--stat -n --no-stat)'{-n,--no-stat}'[do not show diffstat at the end of the merge]'
'( --no-squash)--squash[merge, but do not commit]'
'(--squash )--no-squash[merge and commit]'
'--ff-only[refuse to merge unless HEAD is up to date or merge can be reolved as a fast-forward]'
'*'{-s,--strategy=}'[use given merge strategy]:merge strategy:__git_merge_strategies'
'*'{-X,--strategy-option=}'[pass merge-strategy-specific option to merge strategy]'
'(-q --quiet -v --verbose)'{-q,--quiet}'[suppress all output]'