{"thread":{"id":"46345","subject":"[PATCH] doc: correct a mistake in an illustration","startedAt":"2017-07-10T14:18:38Z","lastAt":"2017-07-10T16:49:53Z","messageCount":2,"participants":["Kaartic Sivaraam","Junio C Hamano"],"isPatch":true,"patchVersion":1,"patchTotal":null},"messages":[{"id":"324070","messageId":"20170710141830.8655-1-kaarticsivaraam91196@gmail.com","threadId":"46345","inReplyTo":null,"subject":"[PATCH] doc: correct a mistake in an illustration","fromName":"Kaartic Sivaraam","fromEmail":"kaarticsivaraam91196@gmail.com","sentAt":"2017-07-10T14:18:30Z","receivedAt":"2017-07-10T14:18:38Z","isPatch":true,"sender":{"key":"kaartic.sivaraam@gmail.com","avatar":"https://avatars.githubusercontent.com/u/12448084?v=4"},"body":"The first illustration of the \"RECOVERING FROM UPSTREAM REBASE\"\nsection in the 'git-rebase' documentation wasn't in line with the\nrest of the illustrations of that section.\n\nCorrect it.\n\nSigned-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>\n---\n Documentation/git-rebase.txt | 2 +-\n 1 file changed, 1 insertion(+), 1 deletion(-)\n\ndiff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\nindex 53f4e1444..652a99062 100644\n--- a/Documentation/git-rebase.txt\n+++ b/Documentation/git-rebase.txt\n@@ -675,7 +675,7 @@ on this 'subsystem'.  You might end up with a history like the\n following:\n \n ------------\n-    o---o---o---o---o---o---o---o---o  master\n+    o---o---o---o---o---o---o---o  master\n \t \\\n \t  o---o---o---o---o  subsystem\n \t\t\t   \\\n-- \n2.13.2.957.g457671ade\n\n"},{"id":"324085","messageId":"xmqqmv8c6xuf.fsf@gitster.mtv.corp.google.com","threadId":"46345","inReplyTo":"20170710141830.8655-1-kaarticsivaraam91196@gmail.com","subject":"Re: [PATCH] doc: correct a mistake in an illustration","fromName":"Junio C Hamano","fromEmail":"gitster@pobox.com","sentAt":"2017-07-10T16:49:44Z","receivedAt":"2017-07-10T16:49:53Z","isPatch":true,"sender":{"key":"gitster@pobox.com","avatar":"https://avatars.githubusercontent.com/u/54884?v=4"},"body":"Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> writes:\n\n> The first illustration of the \"RECOVERING FROM UPSTREAM REBASE\"\n> section in the 'git-rebase' documentation wasn't in line with the\n> rest of the illustrations of that section.\n>\n> Correct it.\n\nYeah. It is unclear from the lack of context, but this part shows\nthe original state with some number of commits on the 'master'\nbranch, and the illustrations that follow depict the evolution of\nhistories starting from this state, yet they have one less commit\non their 'master' branch (and they are not trying to say the master\nis reset to lose one commit), which is what \"wasn't in line\" in the\nlog message means.  \n\nLooks correct to me.  Thanks.\n\n>\n> Signed-off-by: Kaartic Sivaraam <kaarticsivaraam91196@gmail.com>\n> ---\n>  Documentation/git-rebase.txt | 2 +-\n>  1 file changed, 1 insertion(+), 1 deletion(-)\n>\n> diff --git a/Documentation/git-rebase.txt b/Documentation/git-rebase.txt\n> index 53f4e1444..652a99062 100644\n> --- a/Documentation/git-rebase.txt\n> +++ b/Documentation/git-rebase.txt\n> @@ -675,7 +675,7 @@ on this 'subsystem'.  You might end up with a history like the\n>  following:\n>  \n>  ------------\n> -    o---o---o---o---o---o---o---o---o  master\n> +    o---o---o---o---o---o---o---o  master\n>  \t \\\n>  \t  o---o---o---o---o  subsystem\n>  \t\t\t   \\\n"}]}