From: SZEDER Gábor Date: Sat, 14 Feb 2009 16:22:56 GMT Subject: [PATCH] bash: add 'merge --ff' and '--no-ff' options Message-ID: <1234628576-4686-1-git-send-email-szeder@ira.uka.de> Signed-off-by: SZEDER Gábor --- 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