From 45090b19df0f7b8fa2efd9a9aac3e9a6c31a4c6b Mon Sep 17 00:00:00 2001
From: Clint Adams <clint@users.sourceforge.net>
Date: Tue, 6 Mar 2012 02:36:12 +0000
Subject: 30317: complete git merge --ff-only

---
 ChangeLog | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'ChangeLog')

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 $
 *****************************************************
-- 
cgit 1.4.1