# [PATCH] bash: add the merge option --ff-only

1 messages from 2009-11-11 to 2009-11-11. Participants: Björn Gustavsson.
Thread: https://gitlist.dev/t/21576

## Björn Gustavsson, 2009-11-11 04:49

Subject: [PATCH] bash: add the merge option --ff-only
Message-ID: <4AFA4243.4090305@gmail.com>
URL: https://gitlist.dev/e/4AFA4243.4090305%40gmail.com

```
Signed-off-by: Björn Gustavsson <bgustavsson@gmail.com>
---
 contrib/completion/git-completion.bash |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e3ddecc..a0917d1 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 ()
-- 
1.6.5.1.69.g36942

```