urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add "wait" (best to wait to tackle...)

master
Redtexture 2010-03-28 12:21:51 +00:00 committed by Joey Hess
parent c4108d58dc
commit ec110abc6d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/tips/spam_and_softwaresites.mdwn
View File

@ -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.