Skip to content

Commit

Permalink
doc: update curl usage in COLLABORATOR_GUIDE
Browse files Browse the repository at this point in the history
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: #1382
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
  • Loading branch information
silverwind committed Apr 9, 2015
1 parent 61c0e7b commit b464d46
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion COLLABORATOR_GUIDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit b464d46

Please sign in to comment.