threads / patch / 46345

patchdoc: correct a mistake in an illustration

Subject: [PATCH] doc: correct a mistake in an illustration

## tl;dr

2 messages between Jul 10, 2017 and Jul 10, 2017. Diffs are folded; open one to read it.

replies: 1people: 2as markdown or json

Kaartic Sivaraam· Jul 10, 2017, 14:18 UTC · lore

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.
Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
---
 Documentation/git-rebase.txt | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
Show changes to Documentation/git-rebase.txt +1 −1
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
 			   \

-- 
2.13.2.957.g457671ade
Junio C Hamano· Jul 10, 2017, 16:49 UTC · re: Kaartic Sivaraam · lore

Re: [PATCH] doc: correct a mistake in an illustration

Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> writes:
Show 5 quoted lines
> 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.
Show 19 quoted lines
>
> Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>
> ---
>  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
>  			   \

← back to recent threads