On 12/19/22 20:10, Alejandro Colomar wrote:
BTW, I agree with you that the reversed history is a bit weird and confusing. I thought of a new method that would connect both histories while keeping a forward history:A separate orphan branch in normal order, starting at 1.0, which ends at 1.70. And then git allows merging orphan branches, so I can create a merge commit between both 1.70 commits, which of course is a no-op, but one that tells git where and how these branches join.
It was easy to reverse the history. After renaming the old prehistory branch to prehistory-backwards, and creating an orphan branch, and manually picking the first two commits to see how it works (thus the tail(1) invokation), it's automated as:
$ git log prehistory-backwards \ | grep ^commit \ | cut -f2 -d' ' \ | tail -n+3 \ | while read hash; do git checkout $hash -- . \ && git commit --reuse-message=$hash; done;And after the merge, we have something with which I'm quite happy: connected forward histories.
Cheers, Alex --- * 6d57ebaa3 - Mon, 19 Dec 2022 20:48:29 +0100 (4 minutes ago) (HEAD -> prehistory) |\ Merge prehistory and history - Alejandro Colomar | * fea681daf - Wed, 3 Nov 2004 13:51:07 +0000 (18 years ago) (tag: man-pages-1.70) | Import of man-pages 1.70 - Michael Kerrisk * 75d20cea9 - Wed, 3 Nov 2004 13:51:07 +0000 (18 years ago) | Import of man-pages 1.70 - Michael Kerrisk * a2b66da59 - Tue, 12 Oct 2004 00:03:00 +0200 (18 years ago) | man-pages 1.69 - Krónos * 4075cd91b - Sun, 10 Oct 2004 21:37:00 +0200 (18 years ago) | man-pages 1.68 - Krónos * 9dbf677a6 - Fri, 21 May 2004 01:36:00 +0200 (19 years ago) | man-pages 1.67 - Krónos * df824df6a - Sun, 8 Feb 2004 06:59:00 +0100 (19 years ago) | man-pages 1.66 - Krónos * 13b644d56 - Tue, 20 Jan 2004 23:38:00 +0100 (19 years ago) | man-pages 1.65 - Krónos * c5dea9423 - Sat, 29 Nov 2003 01:36:00 +0100 (19 years ago) | man-pages 1.64 - Krónos * 3a84c9581 - Mon, 17 Nov 2003 02:05:00 +0100 (19 years ago) | man-pages 1.63 - Krónos * 08c9c0382 - Fri, 14 Nov 2003 01:48:00 +0100 (19 years ago) | man-pages 1.62 - Krónos * 4a78724b4 - Thu, 13 Nov 2003 02:57:00 +0100 (19 years ago) | man-pages 1.61 - Krónos * efd33757d - Tue, 26 Aug 2003 00:26:00 +0200 (19 years ago) | man-pages 1.60 - Krónos * 38b782a16 - Fri, 22 Aug 2003 02:29:00 +0200 (19 years ago) | man-pages 1.59 - Krónos * 7cb7d2947 - Fri, 25 Jul 2003 00:46:00 +0200 (19 years ago) | man-pages 1.58 - Krónos * f7bfea7fb - Fri, 18 Jul 2003 21:44:00 +0200 (19 years ago) | man-pages 1.57 - Krónos * b73d73174 - Thu, 27 Feb 2003 23:16:00 +0100 (20 years ago) | man-pages 1.56 - Krónos * 657c8b945 - Fri, 7 Feb 2003 19:39:00 +0100 (20 years ago) | man-pages 1.55 - Krónos * 273524524 - Mon, 30 Dec 2002 06:33:00 +0100 (20 years ago) | man-pages 1.54 - Krónos * 2cef28bcc - Mon, 26 Aug 2002 01:30:00 +0200 (20 years ago) | man-pages 1.53 - Krónos * abe7cac51 - Mon, 22 Jul 2002 02:07:00 +0200 (20 years ago) | man-pages 1.52 - Krónos * e5687e13a - Sat, 8 Jun 2002 01:19:00 +0200 (21 years ago) | man-pages 1.51 - Krónos * dc2e98c72 - Thu, 30 May 2002 22:57:00 +0200 (21 years ago) | man-pages 1.50 - Krónos * 9bb551f6d - Thu, 30 May 2002 02:51:00 +0200 (21 years ago) | man-pages 1.49 - Krónos * 23b3c2c7b - Fri, 1 Mar 2002 00:07:00 +0100 (21 years ago) | man-pages 1.48 - Krónos * 4ea5a4fe6 - Wed, 26 Dec 2001 22:02:00 +0100 (21 years ago) | man-pages 1.47 - Krónos * 96e5242eb - Sun, 23 Dec 2001 23:36:00 +0100 (21 years ago) | man-pages 1.46 - Krónos * edd7a0eb3 - Sat, 15 Dec 2001 04:36:00 +0100 (21 years ago) | man-pages 1.45 - Krónos * 20991cf28 - Fri, 30 Nov 2001 23:46:00 +0100 (21 years ago) | man-pages 1.44 - Krónos * 15ee6e691 - Tue, 23 Oct 2001 18:58:00 +0200 (21 years ago) | man-pages 1.43 - Krónos * 21e69fb7d - Fri, 19 Oct 2001 03:16:00 +0200 (21 years ago) | man-pages 1.42 - Krónos * 43ca8d2d9 - Sun, 14 Oct 2001 21:30:00 +0200 (21 years ago) | man-pages 1.41 - Krónos * 2bcc3e5f9 - Tue, 25 Sep 2001 17:44:00 +0200 (21 years ago) | man-pages 1.40 - Krónos * 9d5558f2f - Thu, 26 Jul 2001 01:35:00 +0200 (21 years ago) | man-pages 1.39 - Krónos * 6cc11b2fd - Sun, 10 Jun 2001 01:24:00 +0200 (22 years ago) | man-pages 1.38 - Krónos * 0f65afdb6 - Sat, 2 Jun 2001 00:35:00 +0200 (22 years ago) | man-pages 1.37 - Krónos * bb479545e - Thu, 17 May 2001 22:00:00 +0200 (22 years ago) | man-pages 1.36 - Krónos * a3504cd2d - Sun, 18 Mar 2001 17:32:00 +0100 (22 years ago) | man-pages 1.35 - Krónos * 6f6da5fa7 - Sun, 24 Dec 2000 17:52:00 +0100 (22 years ago) | man-pages 1.34 - Krónos * c26274e15 - Tue, 12 Dec 2000 04:27:00 +0100 (22 years ago) | man-pages 1.33 - Krónos * c4abcc9ee - Mon, 11 Dec 2000 05:34:00 +0100 (22 years ago) | man-pages 1.32 - Krónos * c9348fce0 - Sun, 13 Aug 2000 03:50:00 +0200 (22 years ago) | man-pages 1.31 - Krónos * 91c9890e7 - Sun, 4 Jun 2000 16:40:00 +0200 (23 years ago) | man-pages 1.30 - Krónos * 47aa69480 - Mon, 6 Mar 2000 01:54:00 +0100 (23 years ago) | man-pages 1.29 - Krónos * 167a90543 - Sun, 28 Nov 1999 05:16:00 +0100 (23 years ago) | man-pages 1.28 - Krónos * d892e04e9 - Thu, 11 Nov 1999 04:55:00 +0100 (23 years ago) | man-pages 1.27 - Krónos * 255eb5033 - Tue, 24 Aug 1999 23:48:00 +0200 (23 years ago) | man-pages 1.26 - Krónos * 794948d0e - Mon, 19 Jul 1999 12:36:00 +0200 (23 years ago) | man-pages 1.25 - Krónos * 44724eefc - Tue, 15 Jun 1999 00:37:00 +0200 (24 years ago) | man-pages 1.24 - Krónos * 516f00ab4 - Mon, 29 Mar 1999 13:04:00 +0200 (24 years ago) | man-pages 1.23 - Krónos * c0304f168 - Fri, 27 Nov 1998 21:16:00 +0100 (24 years ago) | man-pages 1.22 - Krónos * 66a5251af - Mon, 7 Sep 1998 01:47:00 +0200 (24 years ago) | man-pages 1.21 - Krónos * dfe1914e9 - Sat, 13 Jun 1998 22:36:00 +0200 (25 years ago) | man-pages 1.20 - Krónos * 76e5b8416 - Sun, 19 Apr 1998 23:53:00 +0200 (25 years ago) | man-pages 1.19 - Krónos * 278efb55a - Mon, 8 Dec 1997 02:11:00 +0100 (25 years ago) | man-pages 1.18 - Krónos * 354ac5c81 - Fri, 18 Jul 1997 13:16:00 +0200 (25 years ago) | man-pages 1.17 - Krónos * 93d136064 - Sat, 31 May 1997 16:14:00 +0200 (26 years ago) | man-pages 1.16 - Krónos * 34a43139d - Sun, 2 Feb 1997 02:55:00 +0100 (26 years ago) | man-pages 1.15 - Krónos * 48ac737ed - Mon, 20 Jan 1997 23:15:00 +0100 (26 years ago) | man-pages 1.14 - Krónos * de7496a42 - Wed, 6 Nov 1996 02:51:00 +0100 (26 years ago) | man-pages 1.13 - Krónos * 091c327d0 - Tue, 23 Jul 1996 12:46:00 +0200 (26 years ago) | man-pages 1.12a - Krónos * b745d0fc7 - Tue, 23 Jul 1996 00:47:00 +0200 (26 years ago) | man-pages 1.12 - Krónos * 308a405f0 - Mon, 15 Apr 1996 01:38:00 +0200 (27 years ago) | man-pages 1.11 - Krónos * e1ba732be - Tue, 16 Jan 1996 00:26:00 +0100 (27 years ago) | man-pages 1.10 - Krónos * d08a203d2 - Tue, 19 Sep 1995 17:13:00 +0200 (27 years ago) | man-pages 1.9 - Krónos * 52cbc5589 - Tue, 15 Aug 1995 21:55:00 +0200 (27 years ago) | man-pages 1.8 - Krónos * a9aefc28b - Sun, 23 Jul 1995 09:33:00 +0200 (27 years ago) | man-pages 1.7 - Krónos * 059dcc4ba - Mon, 12 Jun 1995 01:22:00 +0200 (28 years ago) | man-pages 1.6 - Krónos * feb5d965c - Sun, 26 Feb 1995 23:25:00 +0100 (28 years ago) | man-pages 1.5 - Krónos * d1777189d - Wed, 14 Sep 1994 19:16:00 +0200 (28 years ago) | man-pages 1.4 - Krónos * e6e3f5d0c - Sun, 3 Jul 1994 22:02:00 +0200 (28 years ago) | man-pages 1.3 - Krónos * af6024498 - Mon, 29 Nov 1993 00:00:00 +0100 (29 years ago) | man-pages 1.2 - Krónos * fbed6a6ed - Mon, 11 Oct 1993 00:00:00 +0100 (29 years ago) | man-pages 1.0 - Krónos * c8eee6c3c - Mon, 19 Dec 2022 20:15:55 +0100 (36 minutes ago) void - Alejandro Colomar -- <http://www.alejandro-colomar.es/>
Attachment:
OpenPGP_signature
Description: OpenPGP digital signature