From: Björn Gustavsson <bgustavsson@gmail.com>
Date: Wed, 11 Nov 2009 04:49:07 +0000 (+0100)
Subject: bash: add the merge option --ff-only
X-Git-Tag: v1.6.6-rc0~54
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9858b87fbb990659ea98f1bc77c2e0283cdcaa4a;p=git.git

bash: add the merge option --ff-only

Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

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 ()