Skip to content

Loading…

Gitwash typo #255

Merged
1 commit merged into from

2 participants

@rkern

Fixed an annoying typo in the gitwash document.

@fperez
IPython member

Hey, for stuff this simple, just go ahead and push right away :)

We're trying to be good about doing things via pull requests for more elaborate code changes, but core devs should feel comfortable exercising their judgment, and we more than trust yours :)

I just merged it for you, but next time feel free to push directly things of this nature. Thanks for the fix!

This issue was closed.
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Commits on Jan 31, 2011
  1. @rkern
Showing with 1 addition and 1 deletion.
  1. +1 −1 docs/source/development/gitwash/development_workflow.txt
View
2 docs/source/development/gitwash/development_workflow.txt
@@ -149,7 +149,7 @@ Overview
# pull changes from github
git fetch upstream
# merge from upstream
- git merge upstream master
+ git merge upstream/master
In detail
---------
Something went wrong with that request. Please try again.