git.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Johannes Schindelin <johannes.schindelin@gmx.de>
To: "Jesper Jørgensen" <Jesper.Jorgensen@prevas.dk>
Cc: git@vger.kernel.org
Subject: Re: Git book figure bug
Date: Wed, 02 Sep 2015 10:39:22 +0200	[thread overview]
Message-ID: <bf22f191aed6809871e33fd9b34f5267@www.dscho.org> (raw)
In-Reply-To: <FADA8795DF99B842A563D149FBDDAE5F58341EF5@VMPREVAS2.prevas.se>

Hi Jesper,

On 2015-09-02 09:45, Jesper Jørgensen wrote:

> I am learning how git works, and is using the excellent book on the
> official site.
> I believe I have located a mistake in one of the images.
> It is  about Figure 3.17 on this page :
> http://git-scm.com/book/en/v2/Git-Branching-Basic-Branching-and-Merging
> 
> As far as I understand it, the right most snapshot called C5 should
> have been named C6.
> The texts describes a new snapshot being made from the merge of the 2 branches.
> Having 2 snapshots both named C5 does not seem like it can be possible.

Your hunch is correct, and it should be C6, that's why it was changed:

https://github.com/progit/progit2/blob/master/book/03-git-branching/images/basic-merging-2.png

I do not know why it is still displayed incorrectly on https://git-scm.com/, but your best bet would be to report this as a bug: https://github.com/git/git-scm.com/issues

But make sure first that there is not another ticket opened for the same bug!

Ciao,
Johannes

      parent reply	other threads:[~2015-09-02  8:39 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-02  7:45 Git book figure bug Jesper Jørgensen
2015-09-02  8:36 ` Chris Packham
2015-09-02  8:39 ` Johannes Schindelin [this message]

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=bf22f191aed6809871e33fd9b34f5267@www.dscho.org \
    --to=johannes.schindelin@gmx.de \
    --cc=Jesper.Jorgensen@prevas.dk \
    --cc=git@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
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).