From d6a485d1a117df52d0661711281d1efb98a14a77 Mon Sep 17 00:00:00 2001
From: Brent Cook <bcook@openbsd.org>
Date: Fri, 8 Aug 2014 07:31:28 -0500
Subject: rebase on pull when updating the openbsd branch

this avoids inadvertent local merges
---
 update.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/update.sh b/update.sh
index 21a516d..62fb99f 100755
--- a/update.sh
+++ b/update.sh
@@ -13,7 +13,7 @@ if [ ! -d openbsd ]; then
 fi
 (cd openbsd
  git checkout $openbsd_branch
- git pull)
+ git pull --rebase)
 
 dir=`pwd`
 libssl_src=$dir/openbsd/src/lib/libssl
-- 
cgit v1.2.3-55-g6feb