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

DOC: Fix for #7283 by adding a trailing underscore to misrendered URLs #7286

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Oct 17, 2016
Merged

DOC: Fix for #7283 by adding a trailing underscore to misrendered URLs #7286

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Add a trailing underscore to misrendered URLs
  • Loading branch information
@afvincent
afvincent committed Oct 16, 2016
commit 2a5f8d0e47e748a091a618b9cc4c036e98137e9c
4 changes: 2 additions & 2 deletions 4 doc/devel/gitwash/development_workflow.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,9 +160,9 @@ upstream changes, and resolving conflicts.
In git, rebasing is a mild form of re-writing history: it effectively forwards
all your commits to the updated upstream commit. For a much more detailed
explanation (with pictures!) see `this nice write up
<https://git-scm.com/book/en/Git-Branching-Rebasing>`. The NumPy team has also
<https://git-scm.com/book/en/Git-Branching-Rebasing>`_. The NumPy team has also
`documented how to do this
<http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html#rebasing-on-master>`
<http://docs.scipy.org/doc/numpy/dev/gitwash/development_workflow.html#rebasing-on-master>`_.
In general, re-writing history, particularly published history, is considered
bad practice, but in this case it is very useful.

Expand Down
Morty Proxy This is a proxified and sanitized view of the page, visit original site.