bigger rebase -i

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

diff --git a/usps.md b/usps.md
index b64a695e2a6feb58e5114ceae7d59eb0d625a4b2..a8582800f1b816ad517918479d24dbcb69d2a1d4 100644 (file)
--- a/usps.md
+++ b/usps.md
@@ -1,37 +1,32 @@
-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 in-tree metadata                       | unlike git-dpm
 
-There is no need to ever use quilt
+============================================================
 
-There is no in-tree metadata to get out of date
-| unlike git-dpm
+No need to switch branches                | unlike gbp pq and git-dpm
+Tree always dpkg-buildpackage'able        | unlike gbp pq and git-dpm
 
-Your working tree is never dirtied by your tools
-| unlike gbp pq
+Working tree is never dirtied
+ - by patch application                   | unlike gbp pq
+ - by metadata conflicts
+ - by patch export                        | unlike gbp pq
 
-There is no need to switch branches or switch views
-| unlike gbp pq
+No reading diffs of diffs                 | 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
+git-blame (and git-log file) work         | like dgit-maint-merge
+Tree makes sense to upstreams & users     |  and git-dpm
 
-During development you do not need any orig tarballs;
-they are only needed when actually uploading to Debian.
+No need to ever use quilt(1)
+Can mostly ignore `3.0 (quilt)' .dsc
+`3.0 (quilt)' .dsc output is always perfect
 
-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.
+Directly compatible with dgit.
+No command needed to upload other than dgit push.