summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rw-r--r--Completion/Unix/Command/_git1
2 files changed, 4 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 185a6ec3b..e41177318 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -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 $
 *****************************************************
diff --git a/Completion/Unix/Command/_git b/Completion/Unix/Command/_git
index 5ed921850..78a13761a 100644
--- a/Completion/Unix/Command/_git
+++ b/Completion/Unix/Command/_git
@@ -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]'