dgit-maint-debrebase(7): add another "# if needed"

[dgit.git] / dgit-maint-debrebase.7.pod

diff --git a/dgit-maint-debrebase.7.pod b/dgit-maint-debrebase.7.pod
index e78f5f28eaf220ae2b0f3650149c710ec81bd9cf..fb7c1e18cf60f003c08d8de43d34166b3e45a68d 100644 (file)
--- a/dgit-maint-debrebase.7.pod
+++ b/dgit-maint-debrebase.7.pod
@@ -262,7 +262,7 @@ The first dgit push will require I<--overwrite>.
 
 =head1 GIT CONFIGURATION
 
-git-debrebase does not yet support using B<git merge> to merge
+git-debrebase(1) does not yet support using B<git merge> to merge
 divergent branches of development (see "OTHER MERGES" in
 git-debrebase(5)).  You should configure git such that B<git pull>
 does not try to merge:
@@ -467,7 +467,7 @@ And for subsequent releases (whether or not they require filtering):
     % git checkout upstream-dfsg
     % git merge 1.2.4
     % git rm further-evil.bin # if needed
-    % git commit -m "upstream version 1.2.4 DFSG-cleaned"
+    % git commit -m "upstream version 1.2.4 DFSG-cleaned" # if needed
     % git tag -s 1.2.4+dfsg
     % git checkout master
     % # proceed with "Importing the release"
@@ -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