From: Lasse Schuirmann <lasse.schuirmann@gmail.com>
Date: Thu, 6 Aug 2015 06:10:44 +0000 (+0200)
Subject: rultor: Linearize commit history on merge
X-Git-Tag: dev-2a51c9b95d06~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d1a6f1a3f2e4e0d11643782f36ed1259337dfcfb;p=thirdparty%2Fbabel.git

rultor: Linearize commit history on merge

This will make rultor rebase a PR and then fastforwarding the master
branch if a merge action is requested.
---

diff --git a/.rultor.yml b/.rultor.yml
index 08712969..9f313a88 100644
--- a/.rultor.yml
+++ b/.rultor.yml
@@ -1,2 +1,4 @@
 merge:
+  fast-forward: only
+  rebase: true
   script: echo "Nothing to do (yet)."