From: http://smcv.pseudorandom.co.uk/ Date: Sun, 28 Mar 2010 14:52:03 +0000 (+0000) Subject: revert misleading clarification, and try to clarify better X-Git-Tag: 3.20100403~79 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=9c6b12fe3de453869be7fa2ae5c1d07e9751a69c;p=ikiwiki.git revert misleading clarification, and try to clarify better --- diff --git a/doc/tips/spam_and_softwaresites.mdwn b/doc/tips/spam_and_softwaresites.mdwn index 78a35ff05..507858c0c 100644 --- a/doc/tips/spam_and_softwaresites.mdwn +++ b/doc/tips/spam_and_softwaresites.mdwn @@ -82,5 +82,6 @@ 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 wait to tackle spam with reverts until you have at least one -commit you want merged back into the main history. +this reason, it's best to wait until you have at least one +commit you want merged back into the main history before doing a rebase, +and until then, tackle spam with reverts.