chiark
/
gitweb
/
~ijackson
/
talk-2018-dc18-gdr.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a159127
)
minor edits from sean
author
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 29 Jul 2018 07:41:44 +0000
(08:41 +0100)
committer
Ian Jackson
<ijackson@chiark.greenend.org.uk>
Sun, 29 Jul 2018 07:41:44 +0000
(08:41 +0100)
talk.txt
patch
|
blob
|
history
diff --git
a/talk.txt
b/talk.txt
index 1bd0132ba01d2288ef4b5ce11af42bf424001998..6eaae84cdf6d65b7e4e2f2a8298361d5e263dce8 100644
(file)
--- 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
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-
deb
rebase is for.
Also, unlike git-dpm and some other tools, git-debrebase has no
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.
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
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