aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhttp://k1024.org/~iusty/ <Iustin_Pop@web>2010-08-29 21:59:36 +0000
committerJoey Hess <joey@kitenet.net>2010-08-29 21:59:36 +0000
commit38003fe23a8358f08d22bc5f85c087e5f329e7e9 (patch)
treeb97ed7084b716e2571433a3393db4b9a050468ca
parentf398ad035b973608d380c9939ea845d8e2a0cdc2 (diff)
downloadikiwiki-38003fe23a8358f08d22bc5f85c087e5f329e7e9.tar
ikiwiki-38003fe23a8358f08d22bc5f85c087e5f329e7e9.tar.gz
Add comment on the cleanup spam section
-rw-r--r--doc/tips/spam_and_softwaresites/discussion.mdwn8
1 files changed, 8 insertions, 0 deletions
diff --git a/doc/tips/spam_and_softwaresites/discussion.mdwn b/doc/tips/spam_and_softwaresites/discussion.mdwn
new file mode 100644
index 000000000..21f0a5d7e
--- /dev/null
+++ b/doc/tips/spam_and_softwaresites/discussion.mdwn
@@ -0,0 +1,8 @@
+In the cleanup spam section:
+
+> 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.
+
+Wouldn't it be enough then to use `git reset --hard` to the desired last good commit?
+
+regards,
+iustin