summaryrefslogtreecommitdiff
path: root/deps/uv/CONTRIBUTING.md
diff options
context:
space:
mode:
authorSaúl Ibarra Corretgé <saghul@gmail.com>2014-10-21 00:45:30 +0200
committerTrevor Norris <trev.norris@gmail.com>2014-11-05 16:49:57 -0800
commitce112c27c636ba17129d6061f8db636a80faeb48 (patch)
tree50e2a8185185b31573fe57b2d33cbf7dfa7529bc /deps/uv/CONTRIBUTING.md
parent28ae70ebad8debd8aa7b521a693aa3de89ad84d6 (diff)
downloadandroid-node-v8-ce112c27c636ba17129d6061f8db636a80faeb48.tar.gz
android-node-v8-ce112c27c636ba17129d6061f8db636a80faeb48.tar.bz2
android-node-v8-ce112c27c636ba17129d6061f8db636a80faeb48.zip
deps: update uv to v1.0.0-rc2
PR-URL: https://github.com/joyent/node/pull/8566 Reviewed-by: Fedor Indutny <fedor@indutny.com> Reviewed-by: Trevor Norris <trev.norris@gmail.com>
Diffstat (limited to 'deps/uv/CONTRIBUTING.md')
-rw-r--r--deps/uv/CONTRIBUTING.md6
1 files changed, 3 insertions, 3 deletions
diff --git a/deps/uv/CONTRIBUTING.md b/deps/uv/CONTRIBUTING.md
index 28a32baaea..ea4be395ed 100644
--- a/deps/uv/CONTRIBUTING.md
+++ b/deps/uv/CONTRIBUTING.md
@@ -37,10 +37,10 @@ Okay, so you have decided on the proper branch. Create a feature branch
and start hacking:
```
-$ git checkout -b my-feature-branch -t origin/v0.10
+$ git checkout -b my-feature-branch -t origin/v1.x
```
-(Where v0.10 is the latest stable branch as of this writing.)
+(Where v1.x is the latest stable branch as of this writing.)
### CODE
@@ -131,7 +131,7 @@ Use `git rebase` (not `git merge`) to sync your work from time to time.
```
$ git fetch upstream
-$ git rebase upstream/v0.10 # or upstream/master
+$ git rebase upstream/v1.x # or upstream/master
```