<!DOCTYPE html>
<html>
<head>
<title></title>
<style type="text/css">p.MsoNormal,p.MsoNoSpacing{margin:0}</style>
</head>
<body><div style="font-family:Arial;">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 :(<br></div>
<div style="font-family:Arial;"><br>Bron.<br></div>
<div><br></div>
<div><br></div>
<div>On Tue, 30 Jan 2018, at 23:22, Dan White wrote:<br></div>
<blockquote type="cite"><div>Thanks Bron.<br></div>
<div><br></div>
<div>Is there a way to reorder the date of the commits?<br></div>
<div><br></div>
<div>Here's what I'm seeing:<br></div>
<div><br></div>
<div>git log --pretty=format:"%ad %h by %an, %s" --date=iso | cut -d ' ' -f 1-3<br></div>
<div><br></div>
<div>2018-01-19 09:25:58 -0500<br></div>
<div>2017-12-29 16:59:55 -0600<br></div>
<div>2017-12-25 21:36:15 -0600<br></div>
<div>2017-12-13 11:22:21 +0100<br></div>
<div>2017-11-30 15:39:50 +0000<br></div>
<div>2017-11-30 15:35:38 +0000<br></div>
<div>2017-11-30 15:31:57 +0000<br></div>
<div>2017-11-30 15:18:27 +0000<br></div>
<div>2017-11-29 15:29:47 +0000<br></div>
<div>2017-11-28 16:30:35 +0000<br></div>
<div>2017-11-29 09:51:55 -0500<br></div>
<div>2017-11-25 11:34:16 -0500<br></div>
<div>2017-10-12 11:57:55 +0200<br></div>
<div>2017-10-12 14:27:39 +0900<br></div>
<div>2017-10-12 17:01:55 +0900<br></div>
<div>2017-11-25 11:11:47 -0500<br></div>
<div>2017-10-12 17:19:07 +0900<br></div>
<div>2017-10-12 11:31:32 +0200<br></div>
<div>2017-10-12 11:29:08 +0200<br></div>
<div>2017-10-12 11:25:43 +0200<br></div>
<div>2017-10-12 11:18:53 +0200<br></div>
<div>2017-09-08 22:38:05 +0000<br></div>
<div>2017-09-06 21:12:33 +0000<br></div>
<div>2017-10-09 08:16:52 -0400<br></div>
<div>2017-10-02 14:23:56 +0200<br></div>
<div>2017-10-08 20:31:52 -0400<br></div>
<div>2017-09-08 18:35:44 +0000<br></div>
<div>2017-09-15 10:31:06 -0400<br></div>
<div>2017-09-15 10:30:36 -0400<br></div>
<div>2017-09-12 12:40:13 -0400<br></div>
<div>2017-09-08 13:06:17 -0400<br></div>
<div><br></div>
<div>etc. with jumps as large as 7 months.<br></div>
<div><br></div>
<div>On 01/30/18 20:36 +1100, Bron Gondwana wrote:<br></div>
<blockquote><div>Hi Dan! It looks like Ken pushed a merge from the old head to the<br></div>
<div>new head - oops. I've force killed that as well, and force killed<br></div>
<div>the tag as well.<br></div>
<div><br></div>
<div>On Tue, 30 Jan 2018, at 15:34, Dan White wrote:<br></div>
<blockquote><div>On 01/30/18 09:03 +1100, Bron Gondwana wrote:<br></div>
<blockquote><div>A while ago, some sensitive information was added to a commit message>> which shouldn't have been made that public. In the interests of<br></div>
<div>reducing the distribution of the message, I've reworded the<br></div>
<div>commit and>> rebased the rest of history on top, then force pushed the change.<br></div>
<div>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<br></div>
<div>new master>> branch. Sorry about this, it's an annoying task, but it's the right>> thing to do in this case.<br></div>
<div>Cheers,<br></div>
</blockquote><div><br></div>
<div>Bron,<br></div>
<div><br></div>
<div>Is this change still in progress? The git log for master is in<br></div>
<div>a bit of> disrepair at the moment.<br></div>
<div><br></div>
<div>Many commits are out of date order, and there are 165 duplicate<br></div>
<div>entries,> one of which is the entry I believe was intended to be reworded.<br></div>
</blockquote><div><br></div>
<div>--<br></div>
<div>Bron Gondwana, CEO, FastMail Pty Ltd<br></div>
<div><a href="mailto:brong@fastmailteam.com">brong@fastmailteam.com</a><br></div>
<div><br></div>
<div><br></div>
</blockquote></blockquote><div style="font-family:Arial;"><br></div>
<div id="sig56629417"><div class="signature">--<br></div>
<div class="signature"> Bron Gondwana, CEO, FastMail Pty Ltd<br></div>
<div class="signature"> brong@fastmailteam.com<br></div>
<div class="signature"><br></div>
</div>
<div style="font-family:Arial;"><br></div>
</body>
</html>