Re: Master cyrus-sasl branch on github rebased

[Bron Gondwana <brong@xxxxxxxxxxxxxxxx>]

Hi Dan!  It looks like Ken pushed a merge from the old head to the new head - oops.  I've force killed that as well, and force killed the tag as well.

On Tue, 30 Jan 2018, at 15:34, Dan White wrote:

On 01/30/18 09:03 +1100, Bron Gondwana wrote:

A while ago, some sensitive information was added to a commit message

which shouldn't have been made that public.  In the interests of

reducing the distribution of the message, I've reworded the commit and

rebased the rest of history on top, then force pushed the change.

This means for anybody who currently has branches with local commits,

you'll need to cherry-pick or rebase them over on top of the new master

branch.  Sorry about this, it's an annoying task, but it's the right

thing to do in this case.

Cheers,

Bron,

Is this change still in progress? The git log for master is in a bit of

disrepair at the moment.

Many commits are out of date order, and there are 165 duplicate entries,

one of which is the entry I believe was intended to be reworded.

--

  Bron Gondwana, CEO, FastMail Pty Ltd

  brong@xxxxxxxxxxxxxxxx