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:32:38 -0500 |
| commit | d6a485d1a117df52d0661711281d1efb98a14a77 (patch) | |
| tree | 9983c0bdc9d4cbe0509431bde94845925944c172 | |
| parent | 00b51d5c25abd0d91c7f6b25aeb3bdc8102e436b (diff) | |
| download | portable-d6a485d1a117df52d0661711281d1efb98a14a77.tar.gz portable-d6a485d1a117df52d0661711281d1efb98a14a77.tar.bz2 portable-d6a485d1a117df52d0661711281d1efb98a14a77.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 |