github_merge: always to a merge commit (--no-ff)

Signed-off-by: Jean Privat <jean@pryen.org>

diff --git a/contrib/github_merge.nit b/contrib/github_merge.nit
index c85f4af..712c1e7 100644 (file)
--- a/contrib/github_merge.nit
+++ b/contrib/github_merge.nit
@@ -115,7 +115,7 @@ else
                print "Commit {sha} not in local repository; did you fetch github?"
                return
        end
-       if system("git merge --no-commit {sha}") != 0 then
+       if system("git merge --no-ff --no-commit {sha}") != 0 then
                system("cp mergemsg `git rev-parse --git-dir`/MERGE_MSG")
                print "Problem during merge... Let's do the commit manually."
                return