Re: [PATCH] doc: correct a mistake in an illustration
From: Junio C Hamano <hidden>
Date: 2017-07-10 16:49:53
Kaartic Sivaraam [off-list ref] writes:
The first illustration of the "RECOVERING FROM UPSTREAM REBASE" section in the 'git-rebase' documentation wasn't in line with the rest of the illustrations of that section. Correct it.
Yeah. It is unclear from the lack of context, but this part shows the original state with some number of commits on the 'master' branch, and the illustrations that follow depict the evolution of histories starting from this state, yet they have one less commit on their 'master' branch (and they are not trying to say the master is reset to lose one commit), which is what "wasn't in line" in the log message means. Looks correct to me. Thanks.
quoted hunk
Signed-off-by: Kaartic Sivaraam <redacted> --- 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 53f4e1444..652a99062 100644 --- a/Documentation/git-rebase.txt +++ b/Documentation/git-rebase.txt@@ -675,7 +675,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 \