Restructure the book to the 3rd-edition layout (OUTLINE.md + content moves) - #19
Merged
Conversation
Co-authored-by: Scott Chacon <schacon@gmail.com>
Co-authored-by: Scott Chacon <schacon@gmail.com>
Co-authored-by: Scott Chacon <schacon@gmail.com>
- Renumber chapters: Distributed Git to ch04, Git Toolkit (was Git Tools) to ch05, Customizing Git to ch06, Git Servers (was Git on the Server) to ch08; Git Internals stays ch10 - Drop the GitHub chapter, Git and Other Systems, and appendices A (environments) and B (embedding); the command reference becomes Appendix A (A-git-commands.asc) - Add new placeholder chapters: ch07 Git and Agents and ch09 Git at Scale, with outline-note placeholder sections in the preface style - Add placeholder sections: 3.5 Worktrees, 4.3 Pull Requests and Forges (carrying the rescued _pr_refs, _fetch_and_push_on_different_repositories and _email_notifications anchors), 6.2 Ignoring Files - Retarget all cross-references to the new chapter file names; comment out appendix entries pointing at the dropped Other Systems chapter with AUTHOR TODO notes; flag now-wrong chapter-order prose with AUTHOR TODO comments - Remove 68 images referenced only by dropped chapters - HTML/EPUB/FB2/PDF all build; all 138 internal links resolve Co-authored-by: Scott Chacon <schacon@gmail.com>
Convert all 218 inter-document xrefs (<<chXX-file#anchor>>) to internal xrefs with explicit link text (<<anchor,Ch N, Title>>). Asciidoctor rendered the old form as a dead interdocument link whose text was the raw filename (e.g. "ch01-getting-started.html"); the monolithic book is a single document, so internal refs are correct in every format and the reader's page-splitting link rewriter now maps them to the right section pages automatically. All anchors are unique book-wide (verified), internal hrefs in the generated HTML went from 138 to 213 with zero unresolved targets, and HTML/EPUB/FB2/PDF all build cleanly. Co-authored-by: Scott Chacon <schacon@gmail.com>
schacon
marked this pull request as ready for review
August 3, 2026 19:22
|
Bugbot is not enabled for your account, so this pull request was not reviewed. Enable Bugbot in the Cursor dashboard to get automatic reviews on future PRs. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Summary
Three things on this branch:
OUTLINE.md— the canonical punch list for the 3rd edition: one table row per section (Section, Title, Description, Effort, Status), per-chapter source-file notes, the dropped-content survivor map, open decisions, and cross-cutting mechanical tasks.book/now matches that layout. No book prose was written or rewritten; this is moves, renames, placeholders, and cross-reference plumbing.New chapter map
Getting Started · Git Basics · Git Branching · Distributed Git (ch04, was ch05) · Git Toolkit (ch05, was ch07 "Git Tools") · Customizing Git (ch06, was ch08) · Git and Agents (ch07, new) · Git Servers (ch08, was ch04 "Git on the Server") · Git at Scale (ch09, new) · Git Internals (ch10) · Appendix A: Git Commands (was Appendix C)
Dropped: the GitHub chapter (
ch06/), Git and Other Systems (ch09/), Appendix A (environments), Appendix B (embedding), plus 68 images referenced only by those chapters.What was added
ch07-git-and-agents.asc(5 sections) andch09-git-at-scale.asc(7 sections), each with AUTHOR TODO markers so humans write the prose.ch03/worktrees.asc(3.5),ch04/pull-requests.asc(4.3),ch06/ignoring.asc(6.2)._pr_refs,_fetch_and_push_on_different_repositories,_email_notifications), so every existing cross-reference still resolves.Cross-reference handling
<<chXX-file#anchor>>) converted to internal xrefs with explicit link text (<<anchor,Ch N, Title>>). Asciidoctor rendered the old form as a dead inter-document link whose visible text was the raw filename ("ch01-getting-started.html"); the book builds as a single document, so the internal form is correct in every output format, and the reader's link rewriter now maps them to the right section pages automatically. Anchors verified unique book-wide.Verification
.htmlhrefs are four external URLs).