diff options
| author | Redtexture <Redtexture@web> | 2010-03-28 12:21:51 +0000 |
|---|---|---|
| committer | Joey Hess <joey@finch.kitenet.net> | 2010-03-28 12:21:51 +0000 |
| commit | ec110abc6d412db5f65ea5b9311596bbe7799fd4 (patch) | |
| tree | 9635dec66120e72f452b0347b329b1b5b6f35bdc | |
| parent | c4108d58dcef2805deeb1370367d718d9b8f3184 (diff) | |
| download | ikiwiki-ec110abc6d412db5f65ea5b9311596bbe7799fd4.tar ikiwiki-ec110abc6d412db5f65ea5b9311596bbe7799fd4.tar.gz | |
add "wait" (best to wait to tackle...)
| -rw-r--r-- | doc/tips/spam_and_softwaresites.mdwn | 2 |
1 files changed, 1 insertions, 1 deletions
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. |