From 898e0ef252c8f4c644bbac9a216f5a569353a7cb Mon Sep 17 00:00:00 2001
From: Kaspar Schleiser <kaspar@schleiser.de>
Date: Thu, 3 Mar 2016 00:37:40 +0100
Subject: [PATCH] make: buildtest: allow skipping of rebase-to-master

---
 dist/tools/travis-scripts/build_and_test.sh | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/dist/tools/travis-scripts/build_and_test.sh b/dist/tools/travis-scripts/build_and_test.sh
index 475ad9f1af8e..5f5d497335ce 100755
--- a/dist/tools/travis-scripts/build_and_test.sh
+++ b/dist/tools/travis-scripts/build_and_test.sh
@@ -27,9 +27,10 @@ then
     if [ "$BUILDTEST_MCU_GROUP" == "static-tests" ]
     then
         RESULT=0
-
-        git rebase master || git rebase --abort
-        RESULT=$(set_result $? $RESULT)
+        if [ "$BUILDTEST_NO_REBASE" != "1" ]; then
+            git rebase master || git rebase --abort
+            RESULT=$(set_result $? $RESULT)
+        fi
 
         ./dist/tools/whitespacecheck/check.sh master
         RESULT=$(set_result $? $RESULT)