mikemcquaid / gitinpracticeerrata

🐛 Errata for Git In Practice

Some things you should know about life:

• all open source maintainers (including me!) owe you nothing
• emailing open source maintainers (including me!) directly instead of opening issues on their project is a rude thing to do
• there's some things that good engineers do
• drive-by negativity is literally killing open source
• you should stop mentoring first-time contributors to open source projects
• if you can't say something nice: maybe you shouldn't say anything at all
• if you're automating things remember that robots are better at pedantry and humans at empathy
• dogs love you in a way that your cat never will
• you should have a system to get things done (or you can copy mine)
• Babylon 5 is the best sci-fi TV program ever made
• you should contribute to open source every friday (or, even better, every weekday)

gitinpracticeerrata's Issues

possible errata in descriptions of merge conflicts

Since I'm still a Git novice, it's possible that the following is not an error in the text, but is instead simply my failure to understand the concepts fully. Having said that, it seems like the descriptions of merge conflics in Listings 2.11 and 5.7 may be in error.

My understanding is that the text should read:

Listing 2.11
-2 should read 'Current marker'
-3 should read 'Current line'
-5 should read 'Incoming marker'
-6 should read 'Incoming line'

Supporting text for Listing 2.11
-3 should read 'shows a line from the current branch'
-5 should read 'shows a line from the incoming branch'

If this is correct, similar changes would apply to Listing 5.7 and the supporting text.

Chapter 1: Local Git (correct link in the asciidoc file, but incorrect display in the actual book)

In the corresponding asciidoc file (01-LocalGit.adoc) of Chapter 1: Local Git, in the Discussion subsection in the Technique 2 section , under "Note" the only link, Committing changes to files: git commit, correctly points to the next technique (Technique 3) in the asciidoc file, but it incorrectly shows as Technique 2 on page 9 of the actual book.

Hope this makes sense.

Author/Forum link in Author Online Section redirect set up wrong

http://www.manning.com/GitinPractice

• link in Author online does not redirect to correct place...shouldn't it redirect here...

http://www.manning-sandbox.com/forum.jspa?forumID=895

Chapter 4: History visualization (small formatting error)

On page 71, just below Listing 4.2 Output: showing a commit, bullet point 1 reads

shows all the same information expected in git log output...

but it should be

shows all the same information expected in git log output ...

Chapter 6: Slight Error With Annotations in Listing 6.14

Listing 6.14 which contains the output for rewritten history push failure has the annotations reversed. The annotation labelled 2 Local/remote branches should actually be labelled 1 Local/remote branches and the one labelled 1 push failure should actually be labelled 2 push failure. That way, they match the explanation given below the listing.

Chapter 3: Filesystem interactions (typo)

On page 60,

This interaction between .gitignore and git add is particularly useful when adding
subdirectories of files and directories that may contain files that should to be ignored.

should read

This interaction between .gitignore and git add is particularly useful when adding
subdirectories of files and directories that may contain files that should to be ignored.

Possible typo page 18 section 1.5

The text reads:

This may seen surprising or worrying; after all, didn’t I just tell you
that the history contains the entire list of changes to the project over time?

seen should be seem?