wip

diff --git a/talk.txt b/talk.txt
index d6c7fee0718f040c736bafd62241271f4c3c20a4..0e960b118037f84e0121c54831fbb5c132f90081 100644 (file)
--- a/talk.txt
+++ b/talk.txt
@@ -29,3 +29,41 @@ you make, for Debian, to the upstream parts of the package - as a
 series of commits.
 
 [usps slide]
+
+You can git commit -m fixup! and git commit -m squash!
+| always, unlike gbp pq
+
+You can git-am and git-cherry-pick upstream patches
+| always, unlike gbp pq
+
+You may make mixed commits touching debian/ and upstream files
+| unlike any other Debian delta queue workflow
+
+There is no need to ever use quilt
+
+There is no in-tree metadata to get out of date
+| unlike git-dpm
+
+Your working tree is never dirtied by your tools
+| unlike gbp pq
+
+There is no need to switch branches or switch views
+| unlike gbp pq
+
+Your working tree is always buildable, in-tree, with dpkg-buildpackage, debuild, git-buildpackage, etc.
+| unlike gbp pq
+
+You can mostly ignore the `3.0 (quilt)' source package format
+
+During development you do not need any orig tarballs;
+they are only needed when actually uploading to Debian.
+
+The Debian delta queue is managed using a standard git-rebase workflow.
+
+git-log and git-blame on upstream files show the real upstream history
+followed by your delta queue commits, as expected.
+
+git-log and git-blame on debian/ files show your packaging history.
+
+You don't need to edit diffs, or read diffs of diffs.
+Instead, you edit commits the standard git way.

diff --git a/usps.md b/usps.md
index b64a695e2a6feb58e5114ceae7d59eb0d625a4b2..c97a0e7102bed0d2750bcc0a46e3d196137edd6c 100644 (file)
--- a/usps.md
+++ b/usps.md
@@ -1,37 +1,25 @@
-You can git commit -m fixup! and git commit -m squash!
-| always, unlike gbp pq
+Standard git-rebase workflow              | unlike any
+Delta queue editing is immediate and easy |  other tool
 
-You can git-am and git-cherry-pick upstream patches
-| always, unlike gbp pq
+May always git-cherry-pick from upstream  | unlike any other
+May always git commit -m fixup!           |  delta queue
+May make "mixed" commits                  |   workflow
 
-You may make mixed commits touching debian/ and upstream files
-| unlike any other Debian delta queue workflow
+No need to switch branches                | unlike gbp pq
+Tree always dpkg-buildpackage'able        |  and git-dpm
 
-There is no need to ever use quilt
+No editing diffs, or reading diff diffs   | unlike many others
 
-There is no in-tree metadata to get out of date
-| unlike git-dpm
+Working tree is never dirtied             | unlike gbp pq
 
-Your working tree is never dirtied by your tools
-| unlike gbp pq
+No in-tree metadata                       | unlike git-dpm
 
-There is no need to switch branches or switch views
-| unlike gbp pq
+git-blame (and git-log file) work         | like dgit-maint-merge
+Tree makes sense to upstreams & users     |  and git-dpm
 
-Your working tree is always buildable, in-tree, with dpkg-buildpackage, debuild, git-buildpackage, etc.
-| unlike gbp pq
-
-You can mostly ignore the `3.0 (quilt)' source package format
+No need to ever use quilt(1)
+Can mostly ignore `3.0 (quilt)' .dsc
+`3.0 (quilt)' .dsc output is always perfect
 
 During development you do not need any orig tarballs;
 they are only needed when actually uploading to Debian.
-
-The Debian delta queue is managed using a standard git-rebase workflow.
-
-git-log and git-blame on upstream files show the real upstream history
-followed by your delta queue commits, as expected.
-
-git-log and git-blame on debian/ files show your packaging history.
-
-You don't need to edit diffs, or read diffs of diffs.
-Instead, you edit commits the standard git way.