Permalink
Browse files

DOC: Fix typo in a recommended command in gitwash.

  • Loading branch information...
1 parent 2ccc90d commit 9cfbcc756e977ecbf782ba48e2d678a344ef3b43 @rkern rkern committed Jan 31, 2011
Showing with 1 addition and 1 deletion.
  1. +1 −1 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
---------

0 comments on commit 9cfbcc7

Please sign in to comment.