Gitwash typo #255

Merged
1 commit merged into from Feb 9, 2011
@@ -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
---------