aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <bcook@openbsd.org>2016-07-29 07:51:02 -0500
committerBrent Cook <bcook@openbsd.org>2016-07-29 07:51:02 -0500
commit12348e6f64cc3ac6cf5bc01ba5e21e427dd93deb (patch)
tree32890190e0e902fbce84f789d688480be9c58812
parent1b10e48a1f0f6a4b51d0e9e1a6cd6820d3475fd5 (diff)
downloadportable-12348e6f64cc3ac6cf5bc01ba5e21e427dd93deb.tar.gz
portable-12348e6f64cc3ac6cf5bc01ba5e21e427dd93deb.tar.bz2
portable-12348e6f64cc3ac6cf5bc01ba5e21e427dd93deb.zip
create OPENBSD_6_0 branch
-rw-r--r--OPENBSD_BRANCH2
-rwxr-xr-xupdate.sh1
2 files changed, 2 insertions, 1 deletions
diff --git a/OPENBSD_BRANCH b/OPENBSD_BRANCH
index 1f7391f..22b1829 100644
--- a/OPENBSD_BRANCH
+++ b/OPENBSD_BRANCH
@@ -1 +1 @@
master OPENBSD_6_0
diff --git a/update.sh b/update.sh
index 14082a1..0853c6b 100755
--- a/update.sh
+++ b/update.sh
@@ -13,6 +13,7 @@ if [ ! -d openbsd ]; then
13 fi 13 fi
14fi 14fi
15(cd openbsd 15(cd openbsd
16 git fetch
16 git checkout $openbsd_branch 17 git checkout $openbsd_branch
17 git pull --rebase) 18 git pull --rebase)
18 19