From 01826066b085ca136a1fc81ab964fab2d240ad86 Mon Sep 17 00:00:00 2001 From: Kaartic Sivaraam Date: Mon, 10 Jul 2017 19:48:30 +0530 Subject: [PATCH] doc: correct a mistake in an illustration 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 Signed-off-by: Junio C Hamano --- Documentation/git-rebase.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt index de222c81af..3290fc5db9 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt @@ -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 \ -- 2.11.4.GIT