bigger rebase -i

[talk-2018-dc18-gdr.git] / usps.md

diff --git a/usps.md b/usps.md
index c97a0e7102bed0d2750bcc0a46e3d196137edd6c..a8582800f1b816ad517918479d24dbcb69d2a1d4 100644 (file)
--- a/usps.md
+++ b/usps.md
@@ -5,14 +5,21 @@ May always git-cherry-pick from upstream  | unlike any other
 May always git commit -m fixup!           |  delta queue
 May make "mixed" commits                  |   workflow
 
-No need to switch branches                | unlike gbp pq
-Tree always dpkg-buildpackage'able        |  and git-dpm
+No in-tree metadata                       | unlike git-dpm
 
-No editing diffs, or reading diff diffs   | unlike many others
+============================================================
 
-Working tree is never dirtied             | unlike gbp pq
+No need to switch branches                | unlike gbp pq and git-dpm
+Tree always dpkg-buildpackage'able        | unlike gbp pq and git-dpm
 
-No in-tree metadata                       | unlike git-dpm
+Working tree is never dirtied
+ - by patch application                   | unlike gbp pq
+ - by metadata conflicts
+ - by patch export                        | unlike gbp pq
+
+No reading diffs of diffs                 | unlike gbp pq
+
+============================================================
 
 git-blame (and git-log file) work         | like dgit-maint-merge
 Tree makes sense to upstreams & users     |  and git-dpm
@@ -21,5 +28,5 @@ 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.
+Directly compatible with dgit.
+No command needed to upload other than dgit push.