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

better example git-rebase -i
---

diff --git a/Makefile b/Makefile
index 4240b22..9355d1a 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ SLIDES+= usp-2
 SLIDES+= usp-3
 SLIDES+= dm-1
 SLIDES+= dm-2
-SLIDES+= dm-before-rebase
+SLIDES+= dm-rebasing
 SLIDES+= dm-3
 SLIDES+= dm-5
 SLIDES+= dm-6
@@ -57,7 +57,7 @@ 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
+dm-rebasing.ps: dm.fig helm-rebase-crop.ppm
 	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
 
diff --git a/helm-rebase.png b/helm-rebase.png
index c2f122d..0c67eb6 100644
Binary files a/helm-rebase.png and b/helm-rebase.png differ