projects
/
ikiwiki.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
c4108d5
)
add "wait" (best to wait to tackle...)
author
Redtexture
<Redtexture@web>
Sun, 28 Mar 2010 12:21:51 +0000
(12:21 +0000)
committer
Joey Hess
<joey@finch.kitenet.net>
Sun, 28 Mar 2010 12:21:51 +0000
(12:21 +0000)
doc/tips/spam_and_softwaresites.mdwn
patch
|
blob
|
history
diff --git
a/doc/tips/spam_and_softwaresites.mdwn
b/doc/tips/spam_and_softwaresites.mdwn
index fe73518ef3a44f93313d469d3d8647c07947f6d6..78a35ff051c0fc15fdffe733d79004e1be00d016 100644
(file)
--- 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.