DOC: Update gitwash.

This commit is contained in:
Stefan van der Walt
2011-10-23 22:56:43 -07:00
parent 5ec4fdec09
commit d5120a16bc
9 changed files with 51 additions and 51 deletions
+10 -10
View File
@@ -3,7 +3,7 @@
================
You've discovered a bug or something else you want to change
in scikits.image_ .. |emdash| excellent!
in scikits-image_ .. |emdash| excellent!
You've worked out a way to fix it |emdash| even better!
@@ -29,9 +29,9 @@ 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
cd scikits-image
git branch the-fix-im-thinking-of
git checkout the-fix-im-thinking-of
# hack, hack, hack
@@ -44,7 +44,7 @@ Overview
# make the patch files
git format-patch -M -C master
Then, send the generated patch files to the `scikits.image
Then, send the generated patch files to the `scikits-image
mailing list`_ |emdash| where we will thank you warmly.
In detail
@@ -57,10 +57,10 @@ In detail
git config --global user.name "Your Name Comes Here"
#. If you don't already have one, clone a copy of the
scikits.image_ repository::
scikits-image_ repository::
git clone git://github.com/scikits-image/scikits.image.git
cd scikits.image
git clone git://github.com/scikits-image/scikits-image.git
cd scikits-image
#. Make a 'feature branch'. This will be where you work on
your bug fix. It's nice and safe and leaves you with
@@ -100,7 +100,7 @@ In detail
0001-BF-added-tests-for-Funny-bug.patch
0002-BF-added-fix-for-Funny-bug.patch
Send these files to the `scikits.image mailing list`_.
Send these files to the `scikits-image mailing list`_.
When you are done, to switch back to the main copy of the
code, just return to the ``master`` branch::
@@ -115,7 +115,7 @@ more feature branches, you will probably want to switch to
development mode. You can do this with the repository you
have.
Fork the scikits.image_ repository on github |emdash| :ref:`forking`.
Fork the scikits-image_ repository on github |emdash| :ref:`forking`.
Then::
# checkout and refresh master branch from main repo
@@ -124,7 +124,7 @@ Then::
# rename pointer to main repository to 'upstream'
git remote rename origin upstream
# point your repo to default read / write to your fork on github
git remote add origin git@github.com:your-user-name/scikits.image.git
git remote add origin git@github.com:your-user-name/scikits-image.git
# push up any branches you've made and want to keep
git push origin the-fix-im-thinking-of