summaryrefslogtreecommitdiff
path: root/doc/tips
diff options
context:
space:
mode:
authorhttp://smcv.pseudorandom.co.uk/ <http://smcv.pseudorandom.co.uk/@web>2010-03-28 14:52:03 +0000
committerJoey Hess <joey@finch.kitenet.net>2010-03-28 14:52:03 +0000
commit9c6b12fe3de453869be7fa2ae5c1d07e9751a69c (patch)
tree2f54f921a52faf586ea700b6d704cd8ca7e03ba8 /doc/tips
parentec110abc6d412db5f65ea5b9311596bbe7799fd4 (diff)
revert misleading clarification, and try to clarify better
Diffstat (limited to 'doc/tips')
-rw-r--r--doc/tips/spam_and_softwaresites.mdwn5
1 files changed, 3 insertions, 2 deletions
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.