summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoman Reiss <me@silverwind.io>2015-04-09 11:39:59 +0200
committerRoman Reiss <me@silverwind.io>2015-04-09 11:47:55 +0200
commitb464d467a25bed458cf800ff5117af1c1df8841a (patch)
treee363b5c19168eef6b3968033d1e0138464eae192
parent61c0e7b70f0fbbbb5f173678fdeaf8abfb83d83e (diff)
downloadandroid-node-v8-b464d467a25bed458cf800ff5117af1c1df8841a.tar.gz
android-node-v8-b464d467a25bed458cf800ff5117af1c1df8841a.tar.bz2
android-node-v8-b464d467a25bed458cf800ff5117af1c1df8841a.zip
doc: update curl usage in COLLABORATOR_GUIDE
Github now redirects the patch urls hosted on github.com, making it necessary to enable curl redirect handling to obtain patches in the merge process. Example (before and after): https://github.com/iojs/io.js/pull/1382.patch https://patch-diff.githubusercontent.com/raw/iojs/io.js/pull/1382.patch PR-URL: https://github.com/iojs/io.js/pull/1382 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
-rw-r--r--COLLABORATOR_GUIDE.md2
1 files changed, 1 insertions, 1 deletions
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md
index 650253245c..c4b06cbbe5 100644
--- a/COLLABORATOR_GUIDE.md
+++ b/COLLABORATOR_GUIDE.md
@@ -132,7 +132,7 @@ $ git merge --ff-only origin/v1.x
Apply external patches
```text
-$ curl https://github.com/iojs/io.js/pull/xxx.patch | git am --whitespace=fix
+$ curl -L https://github.com/iojs/io.js/pull/xxx.patch | git am --whitespace=fix
```
Check and re-review the changes