Add upstream merge instruction

This commit is contained in:
sergeyfrolov 2017-08-11 16:12:45 -04:00 committed by GitHub
parent 3ab65b623c
commit 1e0af1a3f4

View file

@ -57,4 +57,13 @@ Tests exist, but coverage is very limited. What's covered is a conjunction of
(e.g. no automatic checks for renegotiations, parroting quality and such)
plus we test some other minor things.
Basically, current tests aim to provide a sanity check.
Basically, current tests aim to provide a sanity check.
# Merging upstream
```Bash
git remote add -f golang git@github.com:golang/go.git
git checkout -b golang-upstream golang/master
git subtree split -P src/crypto/tls/ -b golang-tls-upstream
git checkout master
git merge --no-commit golang-tls-upstream
```