[PATCH] bash: add the merge option --ff-only
From: Björn Gustavsson <hidden>
Date: 2016-06-15 22:47:42
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: Björn Gustavsson <redacted> --- 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