From 6c71be2adc4988866fdaef4d1dd31fd75bc5fb21 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Wed, 18 Apr 2018 17:03:20 -0700 Subject: [PATCH] dgit-maint-debrebase(7): improve advice about minimising stitches Signed-off-by: Sean Whitton --- dgit-maint-debrebase.7.pod | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod index f5023e84..601b8e92 100644 --- a/dgit-maint-debrebase.7.pod +++ b/dgit-maint-debrebase.7.pod @@ -400,8 +400,8 @@ git remote such as B, Note that each time you conclude a debrebase you introduce a pseudomerge into your git history, which may make it harder to read. Try to do all of the editing of the delta queue that you think will be -needed for this upload in a single debrebase, so that there is a -single debrebase stitch. +needed for this editing session in a single debrebase, so that there +is a single debrebase stitch. =head1 BUILDING AND UPLOADING @@ -505,12 +505,15 @@ I<--overwrite>. Above we noted that each time you conclude a debrebase, you introduce a pseudomerge into your git history, which may make it harder to read. -A convention you can use to minimise the number of pseudomerges is to -debrebase only right before you upload. +A simple convention you can use to minimise the number of pseudomerges +is to B only right before you upload or push +to B. -Before that point, instead of editing the existing delta queue, you +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 freely push and pull +upstream source to the required state. You can push and pull to and from B during this. Just before uploading, you debrebase, once, to tidy everything up. -- 2.30.2