[jboss-svn-commits] JBL Code SVN: r38002 - labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson.

[jboss-svn-commits at lists.jboss.org]

Author: zhfeng
Date: 2012-04-12 00:36:58 -0400 (Thu, 12 Apr 2012)
New Revision: 38002

Modified:
   labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh
Log:
JBTM-1112 update git pull

Modified: labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh
===================================================================
--- labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh	2012-04-12 03:53:16 UTC (rev 38001)
+++ labs/jbosstm/branches/JBOSSTS_4_16/scripts/hudson/narayana.sh	2012-04-12 04:36:58 UTC (rev 38002)
@@ -23,7 +23,7 @@
 	exit -1
 fi
 
-git pull origin master
+git pull --rebase --ff-only origin master
 if [ "$?" != "0" ]; then
 	exit -1
 fi