summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2018-04-19 09:25:07 -0700
committerSean Whitton <spwhitton@spwhitton.name>2018-04-19 09:43:59 -0700
commit195e21c55a52a651d66e5d7278b5feb0cb5ebfab (patch)
treefd4fe16c2bb5d508776b2d39e2e2fd7e39c5ad1b
parent0df581dab31cc84a16974992d3c449197a2c00b3 (diff)
dgit-maint-debrebase(7): downgrade very minimal debrebasing workflow yet further
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
-rw-r--r--dgit-maint-debrebase.7.pod14
1 files changed, 7 insertions, 7 deletions
diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index e78f5f2..ec58507 100644
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -544,13 +544,13 @@ A simple convention you can use to minimise the number of pseudomerges
is to B<git debrebase conclude> only right before you upload or push
to B<salsa.debian.org>.
-It is possible to reduce the number of pseudomerges further by
-derebasing only (i) when importing a new release, and (ii) right
-before uploading. Instead of editing the existing delta queue, you
-append fixup commits (and reversions of commits) that alter the
-upstream source to the required state. You can push and pull to and
-from B<salsa.debian.org> during this. Just before uploading, you
-debrebase, once, to tidy everything up.
+It is possible, though much less convenient, to reduce the number of
+pseudomerges yet further. We debrebase only (i) when importing a new
+release, and (ii) right before uploading. Instead of editing the
+existing delta queue, you append fixup commits (and reversions of
+commits) that alter the upstream source to the required state. You
+can push and pull to and from B<salsa.debian.org> during this. Just
+before uploading, you debrebase, once, to tidy everything up.
=head2 The debian/patches directory