Master cyrus-sasl branch on github rebased

[Bron Gondwana]

I mean... maybe, if they don't conflict - but what you're actually
seeing is commits from different branches all mashed together because
that's what rebase does :(
Bron.


On Tue, 30 Jan 2018, at 23:22, Dan White wrote:
> Thanks Bron.
> 
> Is there a way to reorder the date of the commits?
> 
> Here's what I'm seeing:
> 
> git log --pretty=format:"%ad %h by %an, %s" --date=iso | cut -d '
> ' -f 1-3> 
> 2018-01-19 09:25:58 -0500
> 2017-12-29 16:59:55 -0600
> 2017-12-25 21:36:15 -0600
> 2017-12-13 11:22:21 +0100
> 2017-11-30 15:39:50 +0000
> 2017-11-30 15:35:38 +0000
> 2017-11-30 15:31:57 +0000
> 2017-11-30 15:18:27 +0000
> 2017-11-29 15:29:47 +0000
> 2017-11-28 16:30:35 +0000
> 2017-11-29 09:51:55 -0500
> 2017-11-25 11:34:16 -0500
> 2017-10-12 11:57:55 +0200
> 2017-10-12 14:27:39 +0900
> 2017-10-12 17:01:55 +0900
> 2017-11-25 11:11:47 -0500
> 2017-10-12 17:19:07 +0900
> 2017-10-12 11:31:32 +0200
> 2017-10-12 11:29:08 +0200
> 2017-10-12 11:25:43 +0200
> 2017-10-12 11:18:53 +0200
> 2017-09-08 22:38:05 +0000
> 2017-09-06 21:12:33 +0000
> 2017-10-09 08:16:52 -0400
> 2017-10-02 14:23:56 +0200
> 2017-10-08 20:31:52 -0400
> 2017-09-08 18:35:44 +0000
> 2017-09-15 10:31:06 -0400
> 2017-09-15 10:30:36 -0400
> 2017-09-12 12:40:13 -0400
> 2017-09-08 13:06:17 -0400
> 
> etc. with jumps as large as 7 months.
> 
> On 01/30/18 20:36 +1100, Bron Gondwana wrote:
>> 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 at fastmailteam.com
>> 
>> 

--
  Bron Gondwana, CEO, FastMail Pty Ltd
  brong at fastmailteam.com


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.andrew.cmu.edu/pipermail/cyrus-sasl/attachments/20180130/e02d9063/attachment-0001.html>