Auto Merge improvements

nebhale · nebhale · commit f2b8d115067e · 2016-03-09T16:21:05.000-08:00
diff --git a/ci/auto-merge.sh b/ci/auto-merge.sh
@@ -15,5 +15,5 @@ pushd merged
   git remote add upstream ../upstream
   git fetch upstream
 
-  git merge --no-ff --log $COMMIT
+  git merge --no-ff --log --no-edit $COMMIT
 popd
