Updated the gitwash build.

This commit is contained in:
Phil Elson
2014-08-31 11:18:36 +01:00
parent bc3563c038
commit d4297c96ca
9 changed files with 35 additions and 35 deletions
+3 -3
View File
@@ -4,7 +4,7 @@
Development workflow
####################
You already have your own forked copy of the scikit-image_ repository, by
You already have your own forked copy of the `scikit-image`_ repository, by
following :ref:`forking`. You have :ref:`set-up-fork`. You have configured
git by following :ref:`configure-git`. Now you are ready for some real work.
@@ -22,7 +22,7 @@ In what follows we'll refer to the upstream scikit-image ``master`` branch, as
* Name your branch for the purpose of the changes - e.g.
``bugfix-for-issue-14`` or ``refactor-database-code``.
* If you can possibly avoid it, avoid merging trunk or any other branches into
your feature branch while you are working.
your feature branch while you are working.
* If you do find yourself merging from trunk, consider :ref:`rebase-on-trunk`
* Ask on the `scikit-image mailing list`_ if you get stuck.
* Ask for code review!
@@ -81,7 +81,7 @@ what the changes in the branch are for. For example ``add-ability-to-fly``, or
git checkout my-new-feature
Generally, you will want to keep your feature branches on your public github_
fork of scikit-image_. To do this, you `git push`_ this new branch up to your
fork of `scikit-image`_. To do this, you `git push`_ this new branch up to your
github repo. Generally (if you followed the instructions in these pages, and by
default), git will have a link to your github repo, called ``origin``. You push
up to your own repo on github with::