Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CLAUDE.md
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ chapters/ # SSG-agnostic tutorial content (canonical)
05-nested-repositories.md
06-expert-topics.md
07-playbook.md
recipes/ (17 recipe pages)
08-appendix.md
09-glossary.md
assets/
Expand Down
57 changes: 57 additions & 0 deletions chapters/07-playbook.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
---
title: "Playbook"
description: "Step-by-step recipes for common Git tasks — undoing changes, branching, merging, rebasing, stashing, tagging, and debugging."
section: "playbook"
order: 7
---

## Overview

This chapter is a quick-reference collection of recipes for common
Git tasks. Each recipe shows the problem, the commands to solve it,
and what to watch out for.

For command syntax, see the [official Git reference](https://git-scm.com/docs).
For definitions, see [Glossary](09-glossary.md).

## Everyday

| Recipe | What you'll find |
|--------|-----------------|
| [Undoing Changes](playbook/undoing-changes.md) | Discard, unstage, reset, revert, and recover lost commits |
| [Diffing](playbook/diffing.md) | Unstaged, staged, between branches, commits, and files |
| [History](playbook/history.md) | Log formatting, filtering by author, date, and path |
| [Stashing](playbook/stashing.md) | Save and restore work in progress |

## Branching and Merging

| Recipe | What you'll find |
|--------|-----------------|
| [Branching](playbook/branching.md) | Create, delete, rename, and inspect branches |
| [Merging](playbook/merging.md) | Fast-forward, no-ff, squash, conflict resolution |
| [Rebasing](playbook/rebasing.md) | Linearize history and squash commits interactively |
| [Cherry-Picking](playbook/cherry-picking.md) | Apply individual commits across branches |

## Remote

| Recipe | What you'll find |
|--------|-----------------|
| [Remote Operations](playbook/remote-operations.md) | Push, pull, force push safely, sync forks |
| [Remote Management](playbook/remote-management.md) | Add, rename, remove remotes, switch URL, SSH setup |

## Project Structure

| Recipe | What you'll find |
|--------|-----------------|
| [Tagging](playbook/tagging.md) | Create, push, and delete annotated tags |
| [Submodules](playbook/submodules.md) | Add, clone, update, and remove submodules |
| [Subtrees](playbook/subtrees.md) | Add, pull, push, and remove subtrees |

## Advanced

| Recipe | What you'll find |
|--------|-----------------|
| [Selectors](playbook/selectors.md) | Tilde, caret, double-dot, triple-dot, reflog refs |
| [Hooks](playbook/hooks.md) | Pre-commit, commit-msg, sharing hooks, bypassing |
| [Debugging](playbook/debugging.md) | Bisect, blame, and search commit history |
| [Configuration](playbook/configuration.md) | Identity, defaults, aliases, and diagnostics |
2 changes: 1 addition & 1 deletion chapters/08-appendix.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ order: 8

This appendix contains reference material that supports the tutorial
chapters — merge strategies, Git clients, external resources, and
notes. For step-by-step recipes, see the [Playbook](playbook/index.md).
notes. For step-by-step recipes, see the [Playbook](07-playbook.md).
For command help, run `git help <command>`.

In this chapter you will learn:
Expand Down
57 changes: 0 additions & 57 deletions chapters/playbook/index.md

This file was deleted.

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
3 changes: 2 additions & 1 deletion docs/ONBOARDING.md
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,8 @@ files for the web version.

```
01-introduction.md 06-expert-topics.md
02-building-blocks.md playbook/ (17 recipe pages)
02-building-blocks.md 07-playbook.md
recipes/ (17 recipe pages)
03-branching-and-merging.md 08-appendix.md
04-remote-repositories.md 09-glossary.md
05-nested-repositories.md
Expand Down
2 changes: 1 addition & 1 deletion docs/PLAYBOOK.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ Operational reference for common tasks in tutorial-git.
- Place exercises at the end of the chapter under `## Exercises`
- Each exercise has: **Task**, **Steps** (numbered), **Verify**
- Exercises within a chapter use the same lab repository
- Cross-topic recipes go in `chapters/playbook/`
- Cross-topic recipes go in `chapters/recipes/`

### 1.4 Adding quiz questions

Expand Down
Loading