From: Rudolf Polzer <divverent@alientrap.org>
Date: Fri, 16 Jul 2010 21:44:35 +0000 (+0200)
Subject: admin-merge: use --no-ff
X-Git-Tag: xonotic-v0.1.0preview~372
X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=6cc00fffaff25a20152ddd04d8c9a11677a88cda;ds=sidebyside

admin-merge: use --no-ff
---

diff --git a/all b/all
index bb0fa483..648983b2 100755
--- 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"