]> git.neil.brown.name Git - git.git/commitdiff
doc: correct a mistake in an illustration
authorKaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Mon, 10 Jul 2017 14:18:30 +0000 (19:48 +0530)
committerJunio C Hamano <gitster@pobox.com>
Mon, 10 Jul 2017 16:50:36 +0000 (09:50 -0700)
The first illustration of the "RECOVERING FROM UPSTREAM REBASE"
section in the 'git-rebase' documentation meant to depict that
there are number of commits on the 'master' branch, but it is
longer than the 'master' branch in the following illustrations
by one commit, even though there is no resetting of 'master' to
lose that commit.

Correct it.

Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
Documentation/git-rebase.txt

index de222c81af98c96678841f258342fe2cc3c426a8..3290fc5db9168b55e7d633ed590be1ce10c3eb94 100644 (file)
@@ -665,7 +665,7 @@ on this 'subsystem'.  You might end up with a history like the
 following:
 
 ------------
-    o---o---o---o---o---o---o---o---o  master
+    o---o---o---o---o---o---o---o  master
         \
          o---o---o---o---o  subsystem
                           \