DOC: Rewash the git docs.

This commit is contained in:
Stefan van der Walt
2011-10-12 13:45:56 -07:00
parent 69a10b62c3
commit b381d59c67
5 changed files with 10 additions and 10 deletions
+2 -2
View File
@@ -10,7 +10,7 @@ These are the instructions if you just want to follow the latest
The steps are:
* :ref:`install-git`
* get local copy of the git repository from github
* get local copy of the `scikits.image github`_ git repository
* update local copy from time to time
Get the local copy of the code
@@ -18,7 +18,7 @@ Get the local copy of the code
From the command line::
git clone git://github.com/scikits.image/scikits.image.git
git clone git://github.com/scikits-image/scikits.image.git
You now have a copy of the code tree in the new ``scikits.image`` directory.
+1 -1
View File
@@ -16,7 +16,7 @@ access to the upstream repo. Being a maintainer, you've got read-write access.
It's good to have your upstream remote have a scary name, to remind you that
it's a read-write remote::
git remote add upstream-rw git@github.com:scikits.image/scikits.image.git
git remote add upstream-rw git@github.com:scikits-image/scikits.image.git
git fetch upstream-rw
*******************
+2 -2
View File
@@ -29,7 +29,7 @@ Overview
git config --global user.email you@yourdomain.example.com
git config --global user.name "Your Name Comes Here"
# get the repository if you don't have it
git clone git://github.com/scikits.image/scikits.image.git
git clone git://github.com/scikits-image/scikits.image.git
# make a branch for your patching
cd scikits.image
git branch the-fix-im-thinking-of
@@ -59,7 +59,7 @@ In detail
#. If you don't already have one, clone a copy of the
scikits.image_ repository::
git clone git://github.com/scikits.image/scikits.image.git
git clone git://github.com/scikits-image/scikits.image.git
cd scikits.image
#. Make a 'feature branch'. This will be where you work on
+4 -4
View File
@@ -13,7 +13,7 @@ Overview
git clone git@github.com:your-user-name/scikits.image.git
cd scikits.image
git remote add upstream git://github.com/scikits.image/scikits.image.git
git remote add upstream git://github.com/scikits-image/scikits.image.git
In detail
=========
@@ -46,7 +46,7 @@ Linking your repository to the upstream repo
::
cd scikits.image
git remote add upstream git://github.com/scikits.image/scikits.image.git
git remote add upstream git://github.com/scikits-image/scikits.image.git
``upstream`` here is just the arbitrary name we're using to refer to the
main scikits.image_ repository at `scikits.image github`_.
@@ -59,8 +59,8 @@ 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/scikits.image/scikits.image.git (fetch)
upstream git://github.com/scikits.image/scikits.image.git (push)
upstream git://github.com/scikits-image/scikits.image.git (fetch)
upstream git://github.com/scikits-image/scikits.image.git (push)
origin git@github.com:your-user-name/scikits.image.git (fetch)
origin git@github.com:your-user-name/scikits.image.git (push)
+1 -1
View File
@@ -1,5 +1,5 @@
.. scikits.image
.. _scikits.image: http://scikits-image.org
.. _`scikits.image github`: http://github.com/scikits.image/scikits.image
.. _`scikits.image github`: http://github.com/scikits-image/scikits.image
.. _`scikits.image mailing list`: http://groups.google.com/group/scikits-image