admin-merge: use --no-ff

[xonotic/xonotic.git] / all

diff --git a/all b/all
index bb0fa4833923a3cd08bd995cde7e5a42e2169db4..648983b233f01a75c62dab0b03fb83883d02f855 100755 (executable)
--- a/all
+++ b/all
@@ -715,7 +715,7 @@ case "$cmd" in
                                        elif yesno "Branch \"$ref\" may want to get merged. Do it?" '{ echo "$logdata"; echo "$diffdata"; } | less -r'; then
                                                git checkout "$realbase"
                                                org=`git rev-parse HEAD`
-                                               if ! git merge "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
+                                               if ! git merge --no-ff "$ref" 2>&1 | tee "$t" && ! { git ls-files -u | grep ' 1   ' >/dev/null; }; then
                                                        git reset --hard "$org"
                                                        GIT_NOTES_REF=refs/notes/admin-merge git notes edit -m "Merge failed:$LF`cat "$t"`" "$ref"
                                                        reportdo4 cat "$t"