Permalink
Browse files

Reverted JBTM-1281

  • Loading branch information...
1 parent 3796d21 commit 0f280ee3229987c37b66fe7404a13c0c70f69e35 @paulrobinson paulrobinson committed Oct 8, 2012
Showing with 1 addition and 1 deletion.
  1. +1 −1 scripts/hudson/narayana.sh
@@ -83,7 +83,7 @@ function build_as {
git remote add upstream $UPSTREAM_GIT_URL
fi
- git pull --rebase --ff-only -s ours upstream master
+ git pull --rebase --ff-only upstream master
[ $? = 0 ] || fatal "git rebase failed"
export MAVEN_OPTS="$MAVEN_OPTS -XX:MaxPermSize=512m"

0 comments on commit 0f280ee

Please sign in to comment.