rebase on pull when updating the openbsd branch

this avoids inadvertent local merges
This commit is contained in:
Brent Cook 2014-08-08 07:31:28 -05:00
parent 00b51d5c25
commit d6a485d1a1

View File

@ -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