git-debrebase(5): tidying up

Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>

diff --git a/README.git-debrebase b/README.git-debrebase
index 12e2a65c6bedf4840d3a5b0d896648a2e10a531c..49fae981d8520be7f987c77b5ad15afd86beb2d2 100644 (file)
--- a/README.git-debrebase
+++ b/README.git-debrebase
@@ -30,19 +30,3 @@ take (for example) B4, above, and be able to perform functions like:
 
 Maybe some of these operations should automatically edit
 debian/changelog.
-
-
-Sean Whitton writes ("Re: Feedback on 3.0 source format problems"):
->  Does the [breakwater] branch contain debian/ alone?
-
-No, it also contains a complete unmodified copy of the upstream code.
-(Except that if upstream had a debian/ directory, it is completely
-replaced.)
-
-For `3.0 (quilt)' the breakwater branch contains roughly what you
-would get if you untarred the origs and the debian.tar.gz, and then
-deleted all the patches without applying them.
-
-
-dgit import handling
---------------------

diff --git a/git-debrebase.5.pod b/git-debrebase.5.pod
index 738ec46cc45045ee8942b55524bd272e4f9011fd..1c73ea3a15990a401d1f0097f14cd48fa71dd94e 100644 (file)
--- a/git-debrebase.5.pod
+++ b/git-debrebase.5.pod
@@ -34,7 +34,7 @@ provided by your upstream.
             /        /          /
            2*       2*         2
           /        /          /
-         1        1          1    `breakwater' branch, merging baseline
+         1        1          1    breakwater branch, merging baseline
         /        /          /     unmodified upstream code
     ---@-----@--A----@--B--C      plus debian/ (but no debian/patches)
       /     /       /                    no ref refers to this: we
@@ -59,8 +59,7 @@ provided by your upstream.
       *       Maintainer's HEAD was here while they were editing,
               before they said they were done, at which point their
               tools generated [% and] -/- commit[s] to convert to
-              the fast-forwarding interchange branch.  (Maybe the
-              tooling is simply `dgit push'.)
+              the fast-forwarding interchange branch.
 
       !       NMUer's HEAD was here when they said `dgit push'.
               Rebase branch launderer turns each ! into an
@@ -339,8 +338,11 @@ Consider a non-dgit NMU followed by a dgit NMU:
 
 We want to transform this into:
 
- I. No new upstream version (0 + 00 eq #)
+=over
+
+=item I. No new upstream version
 
+ (0 + 00 eq #)
                         --/--B3!--%--/------D*-------------/-->
                          /          /                    /
                         %          4                    4**
@@ -356,8 +358,9 @@ We want to transform this into:
           /
        --#----------------------------------------->
 
+=item II. New upstream
 
- II. New upstream (0 + 00 neq #)
+ (0 + 00 neq #)
 
                         --/--B3!--%--/------D*-------------/-->
                          /          /                    /
@@ -378,6 +381,10 @@ We want to transform this into:
                                     /|
                                    0 00
 
+=back
+
 =head1 SEE ALSO
 
-dgit(1), dgit(7), dgit-maint-*(7)
+git-debrebase(1),
+dgit-maint-rebase(7),
+dgit(1)