diff options
| author | Pauli Virtanen <pav@iki.fi> | 2010-10-18 14:27:39 +0200 |
|---|---|---|
| committer | Pauli Virtanen <pav@iki.fi> | 2010-10-19 00:24:02 +0200 |
| commit | 3c2af9e9bff5ad9fdd394f43e14a43fdc6bf6d50 (patch) | |
| tree | 85b59637eca3a6d1a40d0146dce8c1a64e151b4d /doc/source/dev/gitwash/patching.rst | |
| parent | 98484bb6e3958a26d8f7a4742975e13713003c64 (diff) | |
| download | numpy-3c2af9e9bff5ad9fdd394f43e14a43fdc6bf6d50.tar.gz | |
DOC: dev: try to improve Git workflow docs
Diffstat (limited to 'doc/source/dev/gitwash/patching.rst')
| -rw-r--r-- | doc/source/dev/gitwash/patching.rst | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/source/dev/gitwash/patching.rst b/doc/source/dev/gitwash/patching.rst index 01ece8fc6..0126bf1b3 100644 --- a/doc/source/dev/gitwash/patching.rst +++ b/doc/source/dev/gitwash/patching.rst @@ -2,7 +2,8 @@ Making a patch ================ -You've discovered a bug or something else you want to change in NumPy_ - excellent! +You've discovered a bug or something else you want to change in +NumPy_ - excellent! You've worked out a way to fix it - even better! @@ -42,7 +43,8 @@ Overview # make the patch files git format-patch -M -C master -Then, send the generated patch files to the `NumPy mailing list`_ - where we will thank you warmly. +Then, send the generated patch files to the `NumPy mailing list`_ - +where we will thank you warmly. In detail --------- @@ -110,7 +112,8 @@ Fork the NumPy_ repository on github_ - :ref:`forking`. Then:: # checkout and refresh master branch from main repo git checkout master - git pull origin master + git fetch origin + git merge --ff-only origin/master # rename pointer to main repository to 'upstream' git remote rename origin upstream # point your repo to default read / write to your fork on github |