]> sipb.mit.edu Git - ikiwiki.git/commitdiff
Correct comment. We want to merge the branch *doc* into branch *master* as the sample...
authorPaulePanter <PaulePanter@web>
Wed, 14 Apr 2010 17:38:39 +0000 (17:38 +0000)
committerJoey Hess <joey@finch.kitenet.net>
Wed, 14 Apr 2010 17:38:39 +0000 (17:38 +0000)
doc/tips/spam_and_softwaresites.mdwn

index 507858c0cca3f5a9b3bfd70f7a1f662896ec4048..a07889e6b5aef80f96a579486505495a208d7bd1 100644 (file)
@@ -34,7 +34,7 @@ branch. If there is, see 'erase spam from the commit history', below, first.
 
 Once you are confident it's clean:
 
-    # ensure you are on the doc branch
+    # ensure you are on the master branch
     $ git branch
       doc
     * master