From: Redtexture Date: Sun, 28 Mar 2010 12:21:51 +0000 (+0000) Subject: add "wait" (best to wait to tackle...) X-Git-Tag: 3.20100403~80 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=ec110abc6d412db5f65ea5b9311596bbe7799fd4;p=ikiwiki.git add "wait" (best to wait to tackle...) --- diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn index fe73518ef..78a35ff05 100644 --- a/doc/tips/spam_and_softwaresites.mdwn +++ b/doc/tips/spam_and_softwaresites.mdwn @@ -82,5 +82,5 @@ Caveat: if there are no commits you want to keep (i.e. all the commits since the last merge into master are either spam or spam reverts) then `git rebase` will abort. Therefore, this approach only works if you have at least one non-spam commit to the documentation since the last merge into `master`. For -this reason, it's best to tackle spam with reverts until you have at least one +this reason, it's best wait to tackle spam with reverts until you have at least one commit you want merged back into the main history.