From: Ian Jackson Date: Sun, 29 Jul 2018 07:41:44 +0000 (+0100) Subject: minor edits from sean X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ijackson/git?a=commitdiff_plain;ds=sidebyside;h=612b4d7ed90b29ff9fca39ee466daae338cfb034;p=talk-2018-dc18-gdr.git minor edits from sean --- diff --git a/talk.txt b/talk.txt index 1bd0132..6eaae84 100644 --- a/talk.txt +++ b/talk.txt @@ -82,7 +82,7 @@ and in the source package such a merge based workflow squashes all the changes into a single debian-changes patch. So supporting you maintaining a delta queue - that is, a linear series -of changes - is what git-rebase is for. +of changes - is what git-debrebase is for. Also, unlike git-dpm and some other tools, git-debrebase has no @@ -133,8 +133,9 @@ which commits in the package's packaging history introduced each line. With git-debrebase, you never need to use the quilt program. You can mostly ignore the 3.0 quilt source format. -This is all really good for newbies. Particularly, for people from -other sofware development communities who don't know about Debian. +Not having to learn much about 3.0 (quilt) is all really good for +newbies. Particularly, for people from other sofware development +communities who don't know about Debian. Unfortunately it is not possible to paper over the cracks completely: you will still get trouble if you make changes in git which 3.0 quilt