chiark / gitweb /
git-debrebase(5): Untabify the diagram a bit
[dgit.git] / git-debrebase.5.pod
index d3ecda88242e2c33b9484426a042708fe14fbd6c..26e4813f72eadb879c5280a626f6d66829eb89aa 100644 (file)
@@ -80,6 +80,18 @@ Not used, often deleted, and regenerated when needed
 (such as when uploading to Debian),
 by git-debrebase.
 
+=item Interchange branch; breakwater; stitched; laundered
+
+See L</BRANCHES AND BRANCH STATES - OVERVIEW>.
+
+=item Anchor; Packaging
+
+See L</BRANCH CONTENTS - DETAILED SPECIFICATION>.
+
+=item ffq-prev; debrebase-last
+
+See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>.
+
 =back
 
 =head1 DIAGRAM
@@ -95,9 +107,9 @@ by git-debrebase.
          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
+      /     /       /                     no ref refers to this: we
    --#-----#-------#-----> upstream        reconstruct its identity by
-                                          inspecting interchange branch
+                                           inspecting interchange branch
     Key:
 
       1,2,3   commits touching upstream files only