Errata

The paragraph should start as:

<para>
The <option>-A</option> or <option>--all</option> option
to <command>git commit</command> causes it to automatically
stage all unstaged,


Note the first option is a capital 'A'.

The 2nd sentence in the small, 4th paragraph reads, "Over time, a sequences of changes is represented as a series of commits."

If I'm not mistaken, this sentence should read as, "Over time, a sequence of changes is represented as a series of commits." (Change `sequences' into the singular noun `sequence').

A very minor error but everything counts, I suppose.

Note from the Author or Editor:
Yep, that "sequences" should be "sequence".

"one level deeper than t hey" --> they

The same applies for ePub, I'm referring to PDF as reflow makes difficult stating the right location.

Note from the Author or Editor:
Looks like this typo was introduced at layout. Thanks.

"A merge diver" --> driver


The same applies for ePub version, I'm referring to PDF as reflow makes difficult stating the right location.

Note from the Author or Editor:
Yep. This typo needs to be fixed twice, actually. First, in the last sentence
on page 145, "merge diver" should be "merge driver". Second, on page 146
para 4,

The index entry for rebasing includes p. 416 which does not include anything about it.

Note from the Author or Editor:
Yeah, I don't know where that 416 reference came from.
It certainly doesn't belong there and should be removed.

"respectivel" --> respectively

Note from the Author or Editor:
Yep. That typo crept in during layout. Sorry.

"Although the dedicated chapter of submodules provides..."

Huh??? Isn't that THIS chapter? Or is that supposed to mean ch16? That needs clarification.

In general ch17 seemed to me to be a last-minute addition that doesn't quite integrate or flow with the rest of the book in some vague way I can't define better.

Note from the Author or Editor:
Yeah, I'll fix that sentence to refer to Ch 16 better. How about this:

<para>
Although <xref linkend="chap-Submodules" /> provides an exhaustive list of
commands, a quick recap of the basic submodule actions is
helpful:
</para>

"...and interacting with Subversion repositories (Chapter 17)." should say "Chapter 18" since ch17 is actually "Submodule Best Practices."

Note from the Author or Editor:
Yeah, and it should mention chapters 17 in with 16. Like this:

<para>
The next four chapters cover advanced topics of interest:
the use of hooks (<xref linkend="chap-Hooks" />),
combining projects and multiple repositories into a superproject
(<xref linkend="chap-Submodules" />
and <xref linkend="chap-SubmoduleBestPractices" />),
and interacting with Subversion repositories
(<xref linkend="chap-Subversion" />).
</para>

"Initialized empty Git repository in /tmp/public_html/.git/" should be "Initialized empty Git repository in /tmp/bob/.git/.

Note from the Author or Editor:
Neither is correct with today's Git! With 1.8.0 I get:

$ pwd
/tmp/bob
$ git clone /tmp/Depot/public_html.git
Cloning into 'public_html'...
done.

So yeah, let's update the <screen> in Section "Adding a New Developer" to begin:

<screen>
$ <userinput>cd /tmp/bob</userinput>
$ <userinput>git clone /tmp/Depot/public_html.git</userinput>
Cloning into 'public_html'...
done.

$ <userinput>ls</userinput>
public_html

"origin" is wrapped as "ori gin."

Note from the Author or Editor:
Yeah, that's a bad word break for sure. Also see p 198 for another occurrence.

Layout: Can we ensure that this word is kept together?

In the last sentence before the heading "Remotes," origin/ is wrapped as ori gin/.

Note from the Author or Editor:
Hmmm... Second occurrence of this bad word break with 'origin'. See p 207.

Layout, can we fix this?

"master the squash" should be "squash the master".

Note from the Author or Editor:
Wow. Yes. And that's not how it appears in my sources, so that crept in
during layout or printing. It should be:

Thus, you would also like to <firstterm>squash</firstterm> the
<literal>master</literal> and <literal>master^</literal> into
just one commit.

The line "! [master] Added Bob's fixes." should be indented four spaces.

Note from the Author or Editor:
Yep. It should look like this:

$ <userinput>git show-branch</userinput>
! [bug/pr-1] Fix Problem Report 1
! [bug/pr-2] Added Bob's fixes.
! [bug/pr-3] Added a bug fix for pr-3.
! [dev] Started developing NewStuff
* [master] Added a bug fix for pr-3.
-----

The line "! [master] Added Bob's fixes." should be indented four spaces.

Note from the Author or Editor:
Yes. It should look like this:

$ <userinput>git show-branch</userinput>
! [bug/pr-1] Fix Problem Report 1
! [bug/pr-2] Added Bob's fixes.
* [bug/pr-3] Added Bob's fixes.
! [dev] Started developing NewStuff
! [master] Added Bob's fixes.
-----

An astute reader my have formed a lingering question about Git?s data model and its storage of individual files:

In the above sentence, "my have" should be changed to "may have." It is just a typo.

Note from the Author or Editor:
Change "my have" to "may have" in the first sentence of page 36.

"Initially, there are no files and the tracked, ignored, and therefore untracked sets are empty."

The word "therefore" seems misplaced.

Note from the Author or Editor:
Well, we can remove it if it clears things some.

So, let's remove the word "therefore" from the sentence beginning "Initially, there are..."

Text says: "... so Git introduces a new tree, cafed00d." which is a repetition of the tree mentioned in the paragraph before and is irritating. The correct text would be: "... so Git introduces a new tree, 1010220.", because that tree ID is the one the paragraph is talking about.

Note from the Author or Editor:
Hmmm... Yeah, that is a little strained. Sorry.

Let's combine the two paragraphs that begin "As in the .." and "Because the top-level..."
into just one paragraph like this:

<para>
As in the previous picture, the new commit has
added one associated tree object to represent
the total state of directory and file structure.
Because the top-level directory is changed by the
addition of the new subdirectory, the <emphasis>content</emphasis>
of the top-level tree object has changed as well,
so Git introduces a new tree, <literal>cafed00d</literal>.
</para>

'Nuff should be spelled with a U+2019 (?) instead of a U+2018 (?).

Note from the Author or Editor:
I'm good with that.

So, let's use this:

<varlistentry>
<term>Be Free, as in Freedom</term>
<listitem>
<para>
&rsquo;Nuff said.
</para>
</listitem>
</varlistentry>
</variablelist>

A list of admittedly pedantic nitpicks throughout Chapter 6 (page numbers reflect PDF version):

65 (second para): "check in" would be better written as either "checkin" or "check-in"
66 (second para): "wellsuited" should be "well-suited"
72 (second para): "work back" should be "working back"
73 ("git log" output): On my system, using "--abbrev-commit" does not add the ellipses after the first 7 digits of the commit SHA1 value. That is, you wouldn't get "commit 6d9878c...", just "commit 6d9878c". Perhaps the ellipses were printed in an earlier version of Git.
78 (footnote): I think the explanation of "gitk" might be confusing -- it's not considered a "subcommand" simply because it *isn't*. In Ubuntu, at least, it's a totally separate package. I think the footnote is adding potential confusion when none is needed -- just point out that gitk is a separate package independent from the base "git" package and let it go at that.

I think that's it.

Note from the Author or Editor:
Yes, "check in" should be "check-in" on p 65 para 2.
Yes, "well suited" should be "well-suited" on p 66 para 2.
I don't think "working back" is correct on page 72.
Yes, remove the ellipses from "commit 6d9878c..." and "commit 30684df..." from the
example at the top of page 73.

For the footnote on page 78, number 3, let's rewrite it as:

<footnote>
<para>
The <command>gitk</command> command is not a Git subcommand;
it is its own independent command and installable package.
</para>
</footnote>

Pedantically speaking, the proper phrase for the acronym "CVS" should be "Concurrent Versions System", not just "concurrent version system", at least as far as I know.

Note from the Author or Editor:
Oy vey. Make it so!

In the paragraph beginning "Prior to Git, ..." Change "concurrent version system"
to "Concurrent Versions System".

As an interesting note, it was capitalized in my source already.

The paragraph starts with a number:

Quoted text:

"
90 A branch and a tag seem similar, perhaps ...
"

Note from the Author or Editor:
Hmmm... True. This appears to have been introduced in layout or printing.
It should be removed.

The Using Pickaxe paragraph starts with numbers:
Quoted text:

"
Using Pickaxe
87-88 Wheareas git blame tells you about ...
"

I guess these are page numbers entered by mistake

Note from the Author or Editor:
Hmmm. True. But it isn't in my source. Looks like it was introduced
somewhere in layout and printing. It should be removed.