[PATCH] bash: add 'merge --ff' and '--no-ff' options
From: SZEDER Gábor <hidden>
Date: 2016-06-15 22:46:10
Subsystem:
the rest · Maintainer:
Linus Torvalds
Signed-off-by: SZEDER Gábor <redacted> --- contrib/completion/git-completion.bash | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/contrib/completion/git-completion.bash b/contrib/completion/git-completion.bash
index e848d5d..ad45717 100755
--- a/contrib/completion/git-completion.bash
+++ b/contrib/completion/git-completion.bash@@ -1037,6 +1037,7 @@ _git_merge () --*) __gitcomp " --no-commit --no-stat --log --no-log --squash --strategy + --ff --no-ff " return esac
--
1.6.2.rc0.111.g246ed