diff options
| author | Brent Cook <bcook@openbsd.org> | 2014-08-08 07:31:28 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2014-08-08 07:33:23 -0500 |
| commit | 6f4f4e1f34062155d63bec6b635f46440a8ab064 (patch) | |
| tree | b917759bd37647fb94f4218ec975c15769dadac6 | |
| parent | 5196a58dae2faf8edbbf54e7c2d0a3d741113301 (diff) | |
| download | portable-6f4f4e1f34062155d63bec6b635f46440a8ab064.tar.gz portable-6f4f4e1f34062155d63bec6b635f46440a8ab064.tar.bz2 portable-6f4f4e1f34062155d63bec6b635f46440a8ab064.zip | |
rebase on pull when updating the openbsd branch
this avoids inadvertent local merges
| -rwxr-xr-x | update.sh | 2 |
1 files changed, 1 insertions, 1 deletions
| @@ -13,7 +13,7 @@ if [ ! -d openbsd ]; then | |||
| 13 | fi | 13 | fi |
| 14 | (cd openbsd | 14 | (cd openbsd |
| 15 | git checkout $openbsd_branch | 15 | git checkout $openbsd_branch |
| 16 | git pull) | 16 | git pull --rebase) |
| 17 | 17 | ||
| 18 | dir=`pwd` | 18 | dir=`pwd` |
| 19 | libssl_src=$dir/openbsd/src/lib/libssl | 19 | libssl_src=$dir/openbsd/src/lib/libssl |