diff options
author | Roman Reiss <me@silverwind.io> | 2015-04-09 12:39:59 +0300 |
---|---|---|
committer | Roman Reiss <me@silverwind.io> | 2015-04-09 12:47:55 +0300 |
commit | b464d467a25bed458cf800ff5117af1c1df8841a (patch) | |
tree | e363b5c19168eef6b3968033d1e0138464eae192 /COLLABORATOR_GUIDE.md | |
parent | 61c0e7b70f0fbbbb5f173678fdeaf8abfb83d83e (diff) |
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>
Diffstat (limited to 'COLLABORATOR_GUIDE.md')
-rw-r--r-- | COLLABORATOR_GUIDE.md | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/COLLABORATOR_GUIDE.md b/COLLABORATOR_GUIDE.md index 650253245c5..c4b06cbbe5c 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 |