* [PATCH] doc: correct a mistake in an illustration
@ 2017-07-10 14:18 Kaartic Sivaraam
2017-07-10 16:49 ` Junio C Hamano
0 siblings, 1 reply; 2+ messages in thread
From: Kaartic Sivaraam @ 2017-07-10 14:18 UTC (permalink / raw)
To: gitster; +Cc: git
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(-)
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
^ permalink raw reply related [flat|nested] 2+ messages in thread
* Re: [PATCH] doc: correct a mistake in an illustration
2017-07-10 14:18 [PATCH] doc: correct a mistake in an illustration Kaartic Sivaraam
@ 2017-07-10 16:49 ` Junio C Hamano
0 siblings, 0 replies; 2+ messages in thread
From: Junio C Hamano @ 2017-07-10 16:49 UTC (permalink / raw)
To: Kaartic Sivaraam; +Cc: git
Kaartic Sivaraam <kaarticsivaraam91196@gmail.com> 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.
>
> 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
> \
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-07-10 16:49 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-07-10 14:18 [PATCH] doc: correct a mistake in an illustration Kaartic Sivaraam
2017-07-10 16:49 ` Junio C Hamano
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).