From: PaulePanter Date: Wed, 14 Apr 2010 17:38:39 +0000 (+0000) Subject: Correct comment. We want to merge the branch *doc* into branch *master* as the sample... X-Git-Tag: 3.20100427~169 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=53c8e674ace50d8733e913e8cfa5d40793e5019d;p=ikiwiki.git Correct comment. We want to merge the branch *doc* into branch *master* as the sample output suggests. --- diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn index 507858c0c..a07889e6b 100644 --- a/doc/tips/spam_and_softwaresites.mdwn +++ b/doc/tips/spam_and_softwaresites.mdwn @@ -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