From 9858b87fbb990659ea98f1bc77c2e0283cdcaa4a Mon Sep 17 00:00:00 2001
From: =?utf8?q?Bj=C3=B6rn=20Gustavsson?= <bgustavsson@gmail.com>
Date: Wed, 11 Nov 2009 05:49:07 +0100
Subject: [PATCH] bash: add the merge option --ff-only
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---
 contrib/completion/git-completion.bash | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e3ddecc99..a0917d180 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash
@@ -1224,7 +1224,7 @@ _git_log ()
 
 __git_merge_options="
 	--no-commit --no-stat --log --no-log --squash --strategy
-	--commit --stat --no-squash --ff --no-ff
+	--commit --stat --no-squash --ff --no-ff --ff-only
 "
 
 _git_merge ()
-- 
2.26.2