Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 51bc33a

Browse filesBrowse files
tacaswelltacaswell
committed
added numpy link
1 parent 5d0c64d commit 51bc33a
Copy full SHA for 51bc33a

File tree

Expand file treeCollapse file tree

1 file changed

+5
-3
lines changed
Filter options
Expand file treeCollapse file tree

1 file changed

+5
-3
lines changed

‎doc/devel/coding_guide.rst

Copy file name to clipboardExpand all lines: doc/devel/coding_guide.rst
+5-3Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -186,9 +186,11 @@ In git rebasing is a mild form of re-writing history, as it
186186
effectively transplants where your branch from where you intially
187187
forked of off the parent branch to some other point. For a much more
188188
detailed explanation (with pictures!) see `this nice write up
189-
<http://git-scm.com/book/en/Git-Branching-Rebasing>`. In general,
190-
re-writing history, particularly published history, is considered
191-
bad form, but in this case it is very useful.
189+
<http://git-scm.com/book/en/Git-Branching-Rebasing>`. The numpy team
190+
has also `documented how to do this
191+
<http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html#rebasing-on-master>`
192+
In general, re-writing history, particularly published history, is
193+
considered bad form, but in this case it is very useful.
192194

193195
The following example assumes that the remote of _your_ github
194196
repository is called `github` and the remote of the official

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.