From ef7c45df53ec889db12ae518304d1340190a2e8a Mon Sep 17 00:00:00 2001
From: Martin Dietze <herbert@spamcop.net>
Date: Fri, 26 Mar 2010 12:21:22 +0100
Subject: [PATCH] rebase in git pull for nightly build

---
 debian/nightly_build.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/debian/nightly_build.sh b/debian/nightly_build.sh
index 3c3640ce..73316d03 100755
--- a/debian/nightly_build.sh
+++ b/debian/nightly_build.sh
@@ -8,7 +8,7 @@ CHANGELOG="Automatic build from the GIT on `date`"
 BUILDLOG="${HOME}/log/wmaker-testing-nightly.log"
 
 STATUSCMD="git log -1 --pretty=oneline"
-PULLCMD="git pull"
+PULLCMD="git pull --rebase"
 if [ -n "${WMAKER_DISTRO}" ]; then
   case ${WMAKER_DISTRO} in
     unstable)