From: Ian Jackson <ijackson@chiark.greenend.org.uk>
Date: Sun, 29 Jul 2018 09:02:25 +0000 (+0100)
Subject: wip rebase -i slide
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;h=f834a10091f280040b067af3829375f87e7d7657;p=talk-2018-dc18-gdr.git

wip rebase -i slide
---

diff --git a/.gitignore b/.gitignore
index cdeb732..281dee4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,6 +2,7 @@ dm-*.ps
 usp-*.ps
 zoom.ps
 refs.ps
+helm-rebase-crop.ppm
 context.ps
 slides.pdf
 slides.ps
diff --git a/Makefile b/Makefile
index 9d45b7d..4240b22 100644
--- a/Makefile
+++ b/Makefile
@@ -5,6 +5,7 @@ SLIDES+= usp-2
 SLIDES+= usp-3
 SLIDES+= dm-1
 SLIDES+= dm-2
+SLIDES+= dm-before-rebase
 SLIDES+= dm-3
 SLIDES+= dm-5
 SLIDES+= dm-6
@@ -56,6 +57,10 @@ 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+110:1$*9,2$*0:2$*9 <$@.1 $o
 
+dm-before-rebase.ps: dm.fig
+	iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
+	LC_CTYPE=en_GB fig2dev -L ps -l dummy -z A4 -D+24,110:129,220:229 <$@.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
@@ -77,6 +82,9 @@ 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,144:145,153,+110:149,240:249 <$@.1 $o
 
+helm-rebase-crop.ppm: helm-rebase.png Makefile
+	pngtopnm <$< | pnmcut -right 800 -bottom 300 >$@
+
 %.eps:   %.fig
 	iconv <$< >$@.1 -f UTF-8 -t ISO-8859-1
 	# wtf!
diff --git a/dm.fig b/dm.fig
index d90c2a8..3c96b85 100644
--- a/dm.fig
+++ b/dm.fig
@@ -114,6 +114,9 @@ Single
 	 -675 -7020 1080 -7020 1080 -7200 -675 -7200 -675 -7020
 2 2 0 2 7 7 999 -1 -1 0.000 0 0 -1 0 0 5
 	 -1080 -450 10170 -450 10170 -8235 -1080 -8235 -1080 -450
+2 5 0 1 0 -1 24 -1 -1 0.000 0 0 -1 0 0 5
+	0 helm-rebase-crop.ppm
+	 3124 -4830 9990 -4830 9990 -2250 3124 -2250 3124 -4830
 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
diff --git a/helm-rebase.png b/helm-rebase.png
new file mode 100644
index 0000000..c2f122d
Binary files /dev/null and b/helm-rebase.png differ