Skip to content

Possible Typo? #472

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
daveomcd opened this issue Nov 17, 2014 · 7 comments
Closed

Possible Typo? #472

daveomcd opened this issue Nov 17, 2014 · 7 comments

Comments

@daveomcd
Copy link

Didn't see a contact form or anything on the following website: http://git-scm.com/book/en/v2/Git-Branching-Branches-in-a-Nutshell

I believe there is a typo at the bottom of this article; however, I'm probably wrong. It seems the "Divergent history" graph references 'c2b9e' to the Testing branch, and '87ab2' to the master branch. The console output below it however states the reverse.

@daveomcd
Copy link
Author

image

@dennisschagt
Copy link

It looks like this is fixed in the progit2 repository by changing the image to match the console output, in commit progit/progit2@8725418

@pedrorijo91
Copy link
Member

pedrorijo91 commented Feb 10, 2017

what is it needed to have the image updated on the website also @peff ? I though the images were reused from the book repository

if not, let me know the process, so that I can do a PR fixing it

@peff
Copy link
Member

peff commented Feb 10, 2017

I'm not sure why we don't have the updated images (if we failed to import them, or if they're in the repo but need something special done with the asset code to be served on the site). Some discussion in #515 (comment), but I haven't had a chance to dig deeper.

@jnavila
Copy link
Contributor

jnavila commented Feb 10, 2017

It was fixed last november. We haven't pulled since then.

@peff
Copy link
Member

peff commented Feb 10, 2017

I don't think that's it. The versions I pulled in #775 have several fixes. E.g., see https://github.com/git/git-scm.com/pull/775/files#diff-812dfc5fbd8656872fbf64fe9ffd8c57 for this case.

But the ones you added in 4d71b81 don't have the fixes. So I think we actually were fixed for a while, but regressed recently.

The ones from #775 were mined out of the Atlas-generated zipfile (and as a result, you can see in the diff linked above that the resolution isn't quite as good). So I think we need to re-import, but do it directly into your new image hierarchy.

@peff
Copy link
Member

peff commented Feb 10, 2017

Fixed by #952.

@peff peff closed this as completed Feb 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

No branches or pull requests

5 participants