From 9cfbcc756e977ecbf782ba48e2d678a344ef3b43 2011-01-31 18:18:27
From: Robert Kern <robert.kern@gmail.com>
Date: 2011-01-31 18:18:27
Subject: [PATCH] DOC: Fix typo in a recommended command in gitwash.

---

diff --git a/docs/source/development/gitwash/development_workflow.txt b/docs/source/development/gitwash/development_workflow.txt
index 2804f09..b66c710 100644
--- a/docs/source/development/gitwash/development_workflow.txt
+++ b/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
 ---------