diff options
| author | Joey Hess <joey@kitenet.net> | 2010-08-30 13:03:08 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2010-08-30 13:03:08 -0400 |
| commit | af1e2e6420e9f4d54d0b8cd4d9636ead1d8acde8 (patch) | |
| tree | 49fdbac3626550b9fa38884c8003e3e32cc60bf3 | |
| parent | debdfd45d52d1b200f61d298e0b72a87327d4aae (diff) | |
| parent | 2d411d7729f2afa61afd4fd406747a204b937175 (diff) | |
| download | ikiwiki-af1e2e6420e9f4d54d0b8cd4d9636ead1d8acde8.tar ikiwiki-af1e2e6420e9f4d54d0b8cd4d9636ead1d8acde8.tar.gz | |
Merge branch 'master' of ssh://git.ikiwiki.info/srv/git/ikiwiki.info
| -rw-r--r-- | doc/tips/spam_and_softwaresites/discussion.mdwn | 8 |
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 |