diff options
| author | arokem <arokem@berkeley.edu> | 2010-05-25 15:50:20 -0700 |
|---|---|---|
| committer | arokem <arokem@berkeley.edu> | 2010-05-25 15:50:20 -0700 |
| commit | fa6001f8f4055b74d97b70f1258896a578de39f7 (patch) | |
| tree | d5326fffaf5426184c3eb1cf3adaa63101463690 /doc/devel/set_up_fork.rst | |
| parent | 5ae3f04a6c0a09b74e8db1e6e34f4eddd988eb76 (diff) | |
Committed gitwash related stuff again, after making some fixes
Diffstat (limited to 'doc/devel/set_up_fork.rst')
| -rw-r--r-- | doc/devel/set_up_fork.rst | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/doc/devel/set_up_fork.rst b/doc/devel/set_up_fork.rst index f2a42e7..2c472b7 100644 --- a/doc/devel/set_up_fork.rst +++ b/doc/devel/set_up_fork.rst @@ -11,9 +11,9 @@ Overview :: - git clone git@github.com/your-user-name/fperez.git - cd fperez - git remote add upstream git://github.com/fperez/fperez.git + git clone git@github.com/your-user-name/nitime.git + cd nitime + git remote add upstream git://github.com/fperez/nitime.git In detail ========= @@ -22,8 +22,8 @@ Clone your fork --------------- #. Clone your fork to the local computer with ``git clone - git@github.com:your-user-name/fperez.git`` -#. Investigate. Change directory to your new repo: ``cd fperez``. Then + git@github.com:your-user-name/nitime.git`` +#. Investigate. Change directory to your new repo: ``cd nitime``. Then ``git branch -a`` to show you all branches. You'll get something like:: @@ -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: @@ -45,11 +45,11 @@ Linking your repository to the upstream repo :: - cd fperez - git remote add upstream git://github.com/fperez/fperez.git + cd nitime + git remote add upstream git://github.com/fperez/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/fperez.git (fetch) - upstream git://github.com/fperez/fperez.git (push) - origin git@github.com:your-user-name/fperez.git (fetch) - origin git@github.com:your-user-name/fperez.git (push) + upstream git://github.com/fperez/nitime.git (fetch) + upstream git://github.com/fperez/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 |