chiark / gitweb /
git-debrebase(5): Untabify the diagram a bit
authorIan Jackson <ijackson@chiark.greenend.org.uk>
Sun, 15 Apr 2018 15:56:00 +0000 (16:56 +0100)
committerIan Jackson <ijackson@chiark.greenend.org.uk>
Sat, 16 Jun 2018 15:07:00 +0000 (16:07 +0100)
Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
git-debrebase.5.pod

index 8433eda..26e4813 100644 (file)
@@ -107,9 +107,9 @@ See L</STITCHING, PSEUDO-MERGES, FFQ RECORD>.
          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