Permalink
Browse files

30317: complete git merge --ff-only

  • Loading branch information...
1 parent 942e163 commit 45090b19df0f7b8fa2efd9a9aac3e9a6c31a4c6b Clint Adams committed Mar 6, 2012
Showing with 4 additions and 1 deletion.
  1. +3 −1 ChangeLog
  2. +1 −0 Completion/Unix/Command/_git
View
@@ -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 $
*****************************************************
@@ -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]'

0 comments on commit 45090b1

Please sign in to comment.