From: Ian Jackson Date: Sat, 28 Jul 2018 07:27:37 +0000 (+0100) Subject: renumber layers, nfc X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=2e2a26dc5b56508999bd5f10037bfb3aacdedbbf;p=talk-2018-dc18-gdr.git renumber layers, nfc --- diff --git a/Makefile b/Makefile index af46a92..f1f8685 100644 --- a/Makefile +++ b/Makefile @@ -15,15 +15,15 @@ SLIDES+= dm-6 #SLIDES+= manpage # layers -# X0 text -# X1 circles -# X2 edges -# X3 edges (53 is included in wreck) -# X4,5 upstream git history -# 1X0-9 "master" note -# 1X3 not included in pre-wreck -# 151 included in rebase-again -# 19 not in zoom +# 1X0 text +# 1X1 circles +# 1X2 edges +# 1X3 edges (53 is included in wreck) +# 1X4,5 upstream git history +# 2X0-9 "master" note +# 2X3 not included in pre-wreck +# 251 included in rebase-again +# 119 not in zoom # for # X = # 1 [1] @@ -48,24 +48,24 @@ zoom.fig: dm-for-zoom.eps dm-%.ps: dm.fig iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 - LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:$*9,1$*0:1$*9 <$@.1 $o + LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+110:1$*9,2$*0:2$*9 <$@.1 $o dm-rebase-again.ps: dm.fig conflict.txt.eps ./greyout <$< >$@.fig.tmp iconv <$@.fig.tmp >$@.1 -f UTF-8 -t ISO-8859-1 - LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:79,151,170:179 <$@.1 $o + LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+110:179,251,270:279 <$@.1 $o dm-pre-wreck.ps: dm.fig conflict.txt.eps iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 - LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+10:39,44:45,130:132,135:139 <$@.1 $o + LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+110:139,144:145,230:232,235:239 <$@.1 $o dm-post-wreck.ps: dm.fig conflict.txt.eps iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 - LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+4,5,10:39,44:45,130:132,135:139 <$@.1 $o + LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+4,5,110:139,144:145,230:232,235:239 <$@.1 $o dm-wreck.ps: dm.fig conflict.txt.eps iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 - LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:3,5,44:45,53,+10:49,140:149 <$@.1 $o + LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+1:3,5,144:145,153,+110:149,240:s49 <$@.1 $o %.eps: %.fig iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 @@ -75,7 +75,7 @@ dm-wreck.ps: dm.fig conflict.txt.eps dm-for-zoom.eps: dm.fig iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1 # wtf! - LC_CTYPE=en_GB fig2dev -L eps -D+10:18,20:69,160:168 <$@.1 $o + LC_CTYPE=en_GB fig2dev -L eps -D+110:118,120:169,260:268 <$@.1 $o manpage.ps: dgit.1-manpage Makefile man -Tps -l $< >$@.1 diff --git a/dm.fig b/dm.fig index ad2079f..cb26197 100644 --- a/dm.fig +++ b/dm.fig @@ -25,50 +25,50 @@ Single 4635 -1575 4725 -1440 5265 -1440 5265 -1710 4725 -1710 4635 -1575 4 0 0 44 -1 14 12 0.0000 4 120 480 4725 -1530 v1.2\001 -6 -1 3 0 2 0 7 51 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400 -1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500 -1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 4140 -5400 225 225 4140 -5400 4365 -5400 -1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 360 -2700 225 225 360 -2700 585 -2700 -1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1260 -2700 225 225 1260 -2700 1485 -2700 -1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1530 -3600 225 225 1530 -3600 1755 -3600 -1 3 0 2 0 7 11 -1 20 0.000 1 0.0000 1800 -4500 225 225 1800 -4500 2025 -4500 -1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 3330 -2700 225 225 3330 -2700 3555 -2700 -1 3 0 2 0 7 41 -1 20 0.000 1 0.0000 5850 -3600 225 225 5850 -3600 6075 -3600 -1 3 0 2 0 7 31 -1 20 0.000 1 0.0000 7470 -3150 225 225 7470 -3150 7695 -3150 -1 3 0 2 0 7 51 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500 -1 3 0 2 0 7 21 -1 20 0.000 1 0.0000 2070 -5400 225 225 2070 -5400 2295 -5400 -1 3 0 2 0 7 45 -1 20 0.000 1 0.0000 4365 -1575 225 225 4365 -1575 4590 -1575 -2 1 0 2 0 7 32 -1 -1 0.000 0 0 7 0 0 3 +1 3 0 2 0 7 151 -1 20 0.000 1 0.0000 6390 -5400 225 225 6390 -5400 6615 -5400 +1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 3870 -4500 225 225 3870 -4500 4095 -4500 +1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 4140 -5400 225 225 4140 -5400 4365 -5400 +1 3 0 2 0 7 111 -1 20 0.000 1 0.0000 360 -2700 225 225 360 -2700 585 -2700 +1 3 0 2 0 7 111 -1 20 0.000 1 0.0000 1260 -2700 225 225 1260 -2700 1485 -2700 +1 3 0 2 0 7 111 -1 20 0.000 1 0.0000 1530 -3600 225 225 1530 -3600 1755 -3600 +1 3 0 2 0 7 111 -1 20 0.000 1 0.0000 1800 -4500 225 225 1800 -4500 2025 -4500 +1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 3330 -2700 225 225 3330 -2700 3555 -2700 +1 3 0 2 0 7 141 -1 20 0.000 1 0.0000 5850 -3600 225 225 5850 -3600 6075 -3600 +1 3 0 2 0 7 131 -1 20 0.000 1 0.0000 7470 -3150 225 225 7470 -3150 7695 -3150 +1 3 0 2 0 7 151 -1 20 0.000 1 0.0000 6120 -4500 225 225 6120 -4500 6345 -4500 +1 3 0 2 0 7 121 -1 20 0.000 1 0.0000 2070 -5400 225 225 2070 -5400 2295 -5400 +1 3 0 2 0 7 145 -1 20 0.000 1 0.0000 4365 -1575 225 225 4365 -1575 4590 -1575 +2 1 0 2 0 7 132 -1 -1 0.000 0 0 7 0 0 3 1305 -2700 3330 -2700 4140 -5400 -2 1 0 2 0 7 22 -1 20 0.000 0 0 -1 0 0 2 +2 1 0 2 0 7 122 -1 20 0.000 0 0 -1 0 0 2 1800 -4500 2070 -5400 -2 1 0 2 0 7 12 -1 -1 0.000 0 0 -1 0 0 3 +2 1 0 2 0 7 112 -1 -1 0.000 0 0 -1 0 0 3 -90 -2700 1260 -2700 1800 -4500 -2 1 1 2 0 7 12 -1 -1 6.000 0 0 7 0 0 2 +2 1 1 2 0 7 112 -1 -1 6.000 0 0 7 0 0 2 -90 -2700 -540 -2700 -2 3 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 6 +2 3 0 2 0 7 162 -1 -1 0.000 0 0 7 0 0 6 7335 -7200 7425 -7065 8910 -7065 8910 -7335 7425 -7335 7335 -7200 -2 1 1 2 0 7 62 -1 -1 6.000 0 0 7 0 0 2 +2 1 1 2 0 7 162 -1 -1 6.000 0 0 7 0 0 2 630 -7290 -585 -7290 -2 2 0 2 0 7 130 -1 -1 0.000 0 0 7 0 0 5 +2 2 0 2 0 7 230 -1 -1 0.000 0 0 7 0 0 5 4455 -5310 5265 -5310 5265 -5490 4455 -5490 4455 -5310 -2 2 0 2 0 7 110 -1 -1 0.000 0 0 7 0 0 5 +2 2 0 2 0 7 210 -1 -1 0.000 0 0 7 0 0 5 2115 -4410 2925 -4410 2925 -4590 2115 -4590 2115 -4410 -2 3 0 2 0 7 61 -1 20 0.000 0 0 7 0 0 7 +2 3 0 2 0 7 161 -1 20 0.000 0 0 7 0 0 7 6735 -6300 6930 -6412 6930 -6638 6735 -6750 6540 -6637 6540 -6412 6735 -6300 -2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7 +2 3 0 2 0 7 141 -1 20 0.000 0 0 0 0 0 7 4680 -2475 4875 -2587 4875 -2813 4680 -2925 4485 -2812 4485 -2587 4680 -2475 -2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7 +2 3 0 2 0 7 141 -1 20 0.000 0 0 0 0 0 7 5580 -2475 5775 -2587 5775 -2813 5580 -2925 5385 -2812 5385 -2587 5580 -2475 -2 3 0 2 0 7 41 -1 20 0.000 0 0 0 0 0 7 +2 3 0 2 0 7 141 -1 20 0.000 0 0 0 0 0 7 7485 -3578 7680 -3690 7680 -3916 7485 -4028 7290 -3915 7290 -3690 7485 -3578 -2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 3 +2 1 0 2 0 7 142 -1 -1 0.000 0 0 7 0 0 3 3363 -2704 5580 -2700 5850 -3600 -2 1 0 2 0 7 42 -1 -1 0.000 0 0 7 0 0 2 +2 1 0 2 0 7 142 -1 -1 0.000 0 0 7 0 0 2 4410 -1800 4664 -2691 2 1 0 2 0 7 1 -1 20 0.000 0 0 -1 0 0 2 6345 -4680 8550 -5175 @@ -76,106 +76,106 @@ Single 3195 -5175 5850 -4680 2 2 0 2 7 7 3 -1 20 0.000 0 0 -1 0 0 5 3870 -5265 4230 -5265 4230 -4815 3870 -4815 3870 -5265 -2 2 0 2 0 7 120 -1 -1 0.000 0 0 7 0 0 5 +2 2 0 2 0 7 220 -1 -1 0.000 0 0 7 0 0 5 2385 -5310 3195 -5310 3195 -5490 2385 -5490 2385 -5310 -2 2 0 2 0 7 160 -1 20 0.000 0 0 7 0 0 5 +2 2 0 2 0 7 260 -1 20 0.000 0 0 7 0 0 5 7290 -7380 8100 -7380 8100 -7560 7290 -7560 7290 -7380 -2 2 0 2 0 7 151 -1 -1 0.000 0 0 7 0 0 5 +2 2 0 2 0 7 251 -1 -1 0.000 0 0 7 0 0 5 6705 -5310 7515 -5310 7515 -5490 6705 -5490 6705 -5310 -2 2 0 2 32 7 171 -1 20 0.000 0 0 7 0 0 5 +2 2 0 2 32 7 271 -1 20 0.000 0 0 7 0 0 5 7290 -7380 9045 -7380 9045 -7560 7290 -7560 7290 -7380 -2 1 0 2 0 7 53 -1 -1 0.000 0 0 7 0 0 2 +2 1 0 2 0 7 153 -1 -1 0.000 0 0 7 0 0 2 5844 -3616 6138 -4523 -2 1 0 2 0 7 52 -1 -1 0.000 0 0 7 0 0 2 +2 1 0 2 0 7 152 -1 -1 0.000 0 0 7 0 0 2 6119 -4500 6410 -5438 -2 1 0 2 0 7 62 -1 -1 0.000 0 0 -1 0 0 2 +2 1 0 2 0 7 162 -1 -1 0.000 0 0 -1 0 0 2 6745 -6522 6385 -5352 -2 1 0 2 0 7 62 -1 -1 0.000 0 0 7 0 0 3 +2 1 0 2 0 7 162 -1 -1 0.000 0 0 7 0 0 3 630 -7290 6975 -7290 6705 -6480 -2 3 0 2 0 7 61 -1 20 0.000 0 0 7 0 0 7 +2 3 0 2 0 7 161 -1 20 0.000 0 0 7 0 0 7 6960 -7087 7155 -7199 7155 -7425 6960 -7537 6765 -7424 6765 -7199 6960 -7087 -3 2 0 2 0 7 44 -1 -1 0.000 0 0 0 3 +3 2 0 2 0 7 144 -1 -1 0.000 0 0 0 3 3510 -1260 2925 -1620 2430 -1215 0.000 -1.000 0.000 -3 2 0 2 0 7 44 -1 -1 0.000 0 0 0 3 +3 2 0 2 0 7 144 -1 -1 0.000 0 0 0 3 2430 -1215 1845 -1575 1350 -1170 0.000 -1.000 0.000 -3 2 0 2 0 7 44 -1 20 0.000 0 0 0 3 +3 2 0 2 0 7 144 -1 20 0.000 0 0 0 3 4725 -1215 4005 -1665 3510 -1260 0.000 -1.000 0.000 -4 0 0 50 -1 14 20 0.0000 4 210 195 6255 -5310 2\001 -4 0 0 50 -1 14 20 0.0000 4 90 195 6390 -5310 "\001 -4 0 0 50 -1 14 20 0.0000 4 90 195 6120 -4410 "\001 -4 0 0 30 -1 14 20 0.0000 4 210 195 4005 -5310 2\001 -4 0 0 30 -1 14 20 0.0000 4 90 195 4140 -5310 '\001 -4 0 0 30 -1 14 20 0.0000 4 210 195 3735 -4410 3\001 -4 0 0 30 -1 14 20 0.0000 4 90 195 3870 -4410 '\001 -4 0 0 30 -1 14 20 0.0000 4 90 195 3330 -2610 '\001 -4 0 0 10 -1 14 20 0.0000 4 210 195 1710 -4410 2\001 -4 0 0 10 -1 14 20 0.0000 4 195 195 270 -2610 A\001 -4 0 0 10 -1 14 20 0.0000 4 195 195 1170 -2610 B\001 -4 0 0 10 -1 14 20 0.0000 4 210 195 1440 -3510 1\001 -4 0 0 10 -1 16 20 0.0000 4 240 1650 -135 -2160 Breakwater\001 -4 0 0 30 -1 14 20 0.0000 4 195 195 3195 -2610 C\001 -4 0 0 62 -1 14 12 0.0000 4 150 1440 7425 -7155 debian/1.2-1\001 -4 0 0 130 -1 14 12 0.0000 4 120 720 4500 -5355 master\001 -4 0 0 120 -1 14 12 0.0000 4 120 720 2430 -5355 master\001 -4 0 0 110 -1 14 12 0.0000 4 120 720 2160 -4455 master\001 -4 0 0 20 -1 14 20 0.0000 4 210 390 1890 -5310 C3\001 -4 0 0 61 -1 12 12 0.0000 4 180 1080 5490 -6390 d/patches\001 -4 0 0 62 -1 0 12 0.0000 4 0 45 5130 -7335 \001 -4 0 0 62 -1 16 20 0.0000 4 315 2790 1215 -7425 Interchange branch\001 -4 0 0 12 -1 0 15 1.0472 4 225 675 540 -3015 change\001 -4 0 0 12 -1 0 15 1.0472 4 225 990 315 -3015 packaging\001 -4 0 0 12 -1 0 15 0.0000 4 165 765 1845 -3420 commit\001 -4 0 0 12 -1 0 15 0.0000 4 180 570 1845 -3555 queue\001 -4 0 0 12 -1 0 15 0.0000 4 165 480 1845 -3690 delta\001 -4 0 0 20 -1 0 15 0.0000 4 165 765 1125 -5310 commit\001 -4 0 0 20 -1 0 15 0.0000 4 165 615 1215 -5490 mixed\001 -4 0 0 32 -1 0 15 0.0000 4 210 900 4185 -4545 upstream\001 -4 0 0 32 -1 0 15 0.0000 4 225 660 4185 -4320 part of\001 -4 0 0 32 -1 0 15 0.0000 4 225 990 2835 -2295 packaging\001 -4 0 0 32 -1 0 15 0.0000 4 225 660 2925 -2115 part of\001 -4 0 0 62 -1 0 15 0.0000 4 225 2325 1485 -7065 published, eg salsa, dgit\001 -4 0 0 32 -1 14 12 0.0000 4 120 240 4815 -4320 C3\001 -4 0 0 32 -1 14 12 0.0000 4 120 240 3555 -2115 C3\001 -4 0 0 61 -1 0 15 0.0000 4 225 1170 5400 -6570 (re)generate\001 -4 0 0 60 -1 14 20 0.0000 4 195 195 6643 -6423 %\001 -4 0 0 30 -1 14 20 0.0000 4 90 195 7425 -3060 '\001 -4 0 0 32 -1 0 15 0.0000 4 165 735 8055 -3015 rebased\001 -4 0 0 32 -1 0 15 0.0000 4 165 765 8055 -2835 commit\001 -4 0 0 32 -1 0 15 0.0000 4 60 135 7785 -3105 =\001 -4 0 0 32 -1 0 15 0.0000 4 195 990 8055 -3195 rewritten/\001 -4 0 0 40 -1 14 20 0.0000 4 255 195 4590 -2610 @\001 -4 0 0 40 -1 14 20 0.0000 4 210 195 5490 -2610 d\001 -4 0 0 41 -1 0 15 0.0000 4 225 990 5580 -2295 changelog\001 -4 0 0 41 -1 0 15 0.0000 4 165 1125 5580 -2115 add version\001 -4 0 0 41 -1 0 15 0.0000 4 225 675 4095 -2970 special\001 -4 0 0 41 -1 16 20 0.0000 4 240 1035 4185 -3150 Anchor\001 -4 0 0 41 -1 0 15 0.0000 4 180 615 4770 -2970 merge\001 -4 0 0 41 -1 0 15 0.0000 4 225 1365 8055 -3825 autogenerated\001 -4 0 0 41 -1 0 15 0.0000 4 165 765 8055 -3600 commit\001 -4 0 0 41 -1 0 15 0.0000 4 60 135 7830 -3735 =\001 -4 0 0 40 -1 14 20 0.0000 4 90 195 5850 -3510 "\001 -4 0 0 40 -1 14 20 0.0000 4 210 195 5715 -3510 1\001 -4 0 0 50 -1 14 20 0.0000 4 210 195 5985 -4410 3\001 +4 0 0 150 -1 14 20 0.0000 4 210 195 6255 -5310 2\001 +4 0 0 150 -1 14 20 0.0000 4 90 195 6390 -5310 "\001 +4 0 0 150 -1 14 20 0.0000 4 90 195 6120 -4410 "\001 +4 0 0 130 -1 14 20 0.0000 4 210 195 4005 -5310 2\001 +4 0 0 130 -1 14 20 0.0000 4 90 195 4140 -5310 '\001 +4 0 0 130 -1 14 20 0.0000 4 210 195 3735 -4410 3\001 +4 0 0 130 -1 14 20 0.0000 4 90 195 3870 -4410 '\001 +4 0 0 130 -1 14 20 0.0000 4 90 195 3330 -2610 '\001 +4 0 0 110 -1 14 20 0.0000 4 210 195 1710 -4410 2\001 +4 0 0 110 -1 14 20 0.0000 4 195 195 270 -2610 A\001 +4 0 0 110 -1 14 20 0.0000 4 195 195 1170 -2610 B\001 +4 0 0 110 -1 14 20 0.0000 4 210 195 1440 -3510 1\001 +4 0 0 110 -1 16 20 0.0000 4 240 1650 -135 -2160 Breakwater\001 +4 0 0 130 -1 14 20 0.0000 4 195 195 3195 -2610 C\001 +4 0 0 162 -1 14 12 0.0000 4 150 1440 7425 -7155 debian/1.2-1\001 +4 0 0 230 -1 14 12 0.0000 4 120 720 4500 -5355 master\001 +4 0 0 220 -1 14 12 0.0000 4 120 720 2430 -5355 master\001 +4 0 0 210 -1 14 12 0.0000 4 120 720 2160 -4455 master\001 +4 0 0 120 -1 14 20 0.0000 4 210 390 1890 -5310 C3\001 +4 0 0 161 -1 12 12 0.0000 4 180 1080 5490 -6390 d/patches\001 +4 0 0 162 -1 0 12 0.0000 4 0 45 5130 -7335 \001 +4 0 0 162 -1 16 20 0.0000 4 315 2790 1215 -7425 Interchange branch\001 +4 0 0 112 -1 0 15 1.0472 4 225 675 540 -3015 change\001 +4 0 0 112 -1 0 15 1.0472 4 225 990 315 -3015 packaging\001 +4 0 0 112 -1 0 15 0.0000 4 165 765 1845 -3420 commit\001 +4 0 0 112 -1 0 15 0.0000 4 180 570 1845 -3555 queue\001 +4 0 0 112 -1 0 15 0.0000 4 165 480 1845 -3690 delta\001 +4 0 0 120 -1 0 15 0.0000 4 165 765 1125 -5310 commit\001 +4 0 0 120 -1 0 15 0.0000 4 165 615 1215 -5490 mixed\001 +4 0 0 132 -1 0 15 0.0000 4 210 900 4185 -4545 upstream\001 +4 0 0 132 -1 0 15 0.0000 4 225 660 4185 -4320 part of\001 +4 0 0 132 -1 0 15 0.0000 4 225 990 2835 -2295 packaging\001 +4 0 0 132 -1 0 15 0.0000 4 225 660 2925 -2115 part of\001 +4 0 0 162 -1 0 15 0.0000 4 225 2325 1485 -7065 published, eg salsa, dgit\001 +4 0 0 132 -1 14 12 0.0000 4 120 240 4815 -4320 C3\001 +4 0 0 132 -1 14 12 0.0000 4 120 240 3555 -2115 C3\001 +4 0 0 161 -1 0 15 0.0000 4 225 1170 5400 -6570 (re)generate\001 +4 0 0 160 -1 14 20 0.0000 4 195 195 6643 -6423 %\001 +4 0 0 130 -1 14 20 0.0000 4 90 195 7425 -3060 '\001 +4 0 0 132 -1 0 15 0.0000 4 165 735 8055 -3015 rebased\001 +4 0 0 132 -1 0 15 0.0000 4 165 765 8055 -2835 commit\001 +4 0 0 132 -1 0 15 0.0000 4 60 135 7785 -3105 =\001 +4 0 0 132 -1 0 15 0.0000 4 195 990 8055 -3195 rewritten/\001 +4 0 0 140 -1 14 20 0.0000 4 255 195 4590 -2610 @\001 +4 0 0 140 -1 14 20 0.0000 4 210 195 5490 -2610 d\001 +4 0 0 141 -1 0 15 0.0000 4 225 990 5580 -2295 changelog\001 +4 0 0 141 -1 0 15 0.0000 4 165 1125 5580 -2115 add version\001 +4 0 0 141 -1 0 15 0.0000 4 225 675 4095 -2970 special\001 +4 0 0 141 -1 16 20 0.0000 4 240 1035 4185 -3150 Anchor\001 +4 0 0 141 -1 0 15 0.0000 4 180 615 4770 -2970 merge\001 +4 0 0 141 -1 0 15 0.0000 4 225 1365 8055 -3825 autogenerated\001 +4 0 0 141 -1 0 15 0.0000 4 165 765 8055 -3600 commit\001 +4 0 0 141 -1 0 15 0.0000 4 60 135 7830 -3735 =\001 +4 0 0 140 -1 14 20 0.0000 4 90 195 5850 -3510 "\001 +4 0 0 140 -1 14 20 0.0000 4 210 195 5715 -3510 1\001 +4 0 0 150 -1 14 20 0.0000 4 210 195 5985 -4410 3\001 4 0 0 1 -1 14 24 0.0000 4 255 480 5895 -4410 X3\001 4 0 0 1 -1 16 24 0.0000 4 300 2340 6660 -7920 failed rebase\001 -4 0 0 150 -1 16 24 0.0000 4 375 3540 6255 -7920 after new-upstream\001 -4 0 0 19 -1 16 24 0.0000 4 390 7260 -900 -7920 git-debrebase - commit history structure\001 -4 0 0 169 -1 16 24 0.0000 4 375 2160 6255 -7920 after upload\001 -4 0 0 133 -1 16 24 0.0000 4 390 3435 6255 -7920 after git-debrebase\001 +4 0 0 250 -1 16 24 0.0000 4 375 3540 6255 -7920 after new-upstream\001 +4 0 0 119 -1 16 24 0.0000 4 390 7260 -900 -7920 git-debrebase - commit history structure\001 +4 0 0 269 -1 16 24 0.0000 4 375 2160 6255 -7920 after upload\001 +4 0 0 233 -1 16 24 0.0000 4 390 3435 6255 -7920 after git-debrebase\001 4 0 0 4 -1 16 24 0.0000 4 300 2745 6255 -7920 aborted rebase\001 -4 0 0 61 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001 +4 0 0 161 -1 0 15 0.0000 4 225 1290 5490 -7110 pseudomerge\001 4 0 0 5 -1 16 24 0.0000 4 375 3195 6304 -7546 for new-upstream\001 -4 0 0 170 -1 16 24 0.0000 4 375 2160 6255 -7920 rebasing again\001 -4 0 0 160 -1 14 12 0.0000 4 120 720 7335 -7425 master\001 -4 0 0 151 -1 14 12 0.0000 4 120 720 6750 -5355 master\001 -4 0 32 170 -1 14 12 0.0000 4 180 1800 7335 -7425 ffq-prev/master\001 -4 0 0 60 -1 14 20 0.0000 4 255 195 6865 -7215 /\001 -4 0 0 44 -1 16 20 0.0000 4 315 2895 1665 -810 Upstream git history\001 -4 0 32 30 -1 0 15 0.0000 4 180 1275 2329 -5455 no ref refers,\001 -4 0 32 30 -1 0 15 0.0000 4 225 1140 2385 -5265 will be gc'd\001 -4 0 32 40 -1 0 15 0.0000 4 180 1275 4398 -5439 no ref refers,\001 -4 0 32 40 -1 0 15 0.0000 4 225 1140 4423 -5263 will be gc'd\001 +4 0 0 270 -1 16 24 0.0000 4 375 2160 6255 -7920 rebasing again\001 +4 0 0 260 -1 14 12 0.0000 4 120 720 7335 -7425 master\001 +4 0 0 251 -1 14 12 0.0000 4 120 720 6750 -5355 master\001 +4 0 32 270 -1 14 12 0.0000 4 180 1800 7335 -7425 ffq-prev/master\001 +4 0 0 160 -1 14 20 0.0000 4 255 195 6865 -7215 /\001 +4 0 0 144 -1 16 20 0.0000 4 315 2895 1665 -810 Upstream git history\001 +4 0 32 130 -1 0 15 0.0000 4 180 1275 2329 -5455 no ref refers,\001 +4 0 32 130 -1 0 15 0.0000 4 225 1140 2385 -5265 will be gc'd\001 +4 0 32 140 -1 0 15 0.0000 4 180 1275 4398 -5439 no ref refers,\001 +4 0 32 140 -1 0 15 0.0000 4 225 1140 4423 -5263 will be gc'd\001