bash: add the merge option --ff-only

PATCH New Björn Gustavsson 1 participant 1 message Jun 15, 2016

lore

Share & tools

lore

Björn Gustavsson

author

2016-06-15 22:47 UTC #0 lore raw

PATCH 1/1 bash: add the merge option --ff-only

Signed-off-by Björn Gustavsson <[email protected]>

---
 contrib/completion/git-completion.bash |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

contrib/completion/git-completion.bash +1 -1

index e3ddecc..a0917d1 100755
@@ -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 ()

Signature · 1 line

1.6.5.1.69.g36942