diff options
| author | arokem <arokem@berkeley.edu> | 2010-08-18 15:33:41 -0700 |
|---|---|---|
| committer | arokem <arokem@berkeley.edu> | 2010-08-18 15:33:41 -0700 |
| commit | e76b0b9aeba20b410b4d69cd5644820a34419538 (patch) | |
| tree | fb1b593db07aa8e336f2f1fb6d332c3a2a47dc82 /doc/devel/set_up_fork.rst | |
| parent | b010c457aa16759bd617a8d558ebca764980dbd5 (diff) | |
Documentation cleanup
1. New version of gitwash, with pointer to the right repo location.
2. Download and install page now points to the right location.
Diffstat (limited to 'doc/devel/set_up_fork.rst')
| -rw-r--r-- | doc/devel/set_up_fork.rst | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/doc/devel/set_up_fork.rst b/doc/devel/set_up_fork.rst index 2c472b7..f32eb78 100644 --- a/doc/devel/set_up_fork.rst +++ b/doc/devel/set_up_fork.rst @@ -13,7 +13,7 @@ Overview git clone git@github.com/your-user-name/nitime.git cd nitime - git remote add upstream git://github.com/fperez/nitime.git + git remote add upstream git://github.com/nipy/nitime.git In detail ========= @@ -35,7 +35,7 @@ Clone your fork What remote repository is ``remote/origin``? Try ``git remote -v`` to see the URLs for the remote. They will point to your github_ fork. - Now you want to connect to the upstream `Nitime github`_ repository, so + Now you want to connect to the upstream `nitime github`_ repository, so you can merge in changes from trunk. .. _linking-to-upstream: @@ -46,10 +46,10 @@ Linking your repository to the upstream repo :: cd nitime - git remote add upstream git://github.com/fperez/nitime.git + git remote add upstream git://github.com/nipy/nitime.git ``upstream`` here is just the arbitrary name we're using to refer to the -main Nitime_ repository at `Nitime github`_. +main nitime_ repository at `nitime github`_. Note that we've used ``git://`` for the URL rather than ``git@``. The ``git://`` URL is read only. This means we that we can't accidentally @@ -59,10 +59,10 @@ use it to merge into our own code. Just for your own satisfaction, show yourself that you now have a new 'remote', with ``git remote -v show``, giving you something like:: - upstream git://github.com/fperez/nitime.git (fetch) - upstream git://github.com/fperez/nitime.git (push) + upstream git://github.com/nipy/nitime.git (fetch) + upstream git://github.com/nipy/nitime.git (push) origin git@github.com:your-user-name/nitime.git (fetch) origin git@github.com:your-user-name/nitime.git (push) -.. include:: git_links.txt +.. include:: git_links.inc |