wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-09-12 12:50:49 +08:00
Code Issues Packages Projects Releases Wiki Activity

Rename scikits-image to scikit-image

Browse Source
This commit is contained in:
Johannes Schönberger
2012-10-13 23:24:54 -07:00
committed by Stefan van der Walt
parent 6b0e8eb651
commit 2b7c20e670
29 changed files with 104 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files
doc/source/gitwash/patching.txt
+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 scikit-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/scikit-image/scikit-image.git
# make a branch for your patching
cd scikits-image
cd scikit-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 `scikit-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::
scikit-image_ repository::
git clone git://github.com/scikits-image/scikits-image.git
cd scikits-image
git clone git://github.com/scikit-image/scikit-image.git
cd scikit-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 `scikit-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 scikit-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/scikit-image.git
# push up any branches you've made and want to keep
git push origin the-fix-im-thinking-of