Prev | Contents | Next

Beej's Guide to Git

Brian “Beej Jorgensen” Hall

v1.2.5, Copyright © February 20, 2025

1 Foreword
2 Git Basics
3 GitHub: How To Use It
4 The Git Log and HEAD
5 Branches and Fast-Forward Merges
6 Merging and Conflicts
7 Using Subdirectories with Git
8 Ignoring Files with .gitignore
9 Remotes: Repos in Other Places
10 Remote Tracking Branches
11 File States
12 Comparing Files with Diff
13 Renaming and Removing Files
14 Collaboration across Branches
15 Rebasing: Moving Commits
16 Stashing: Temporarily Set Changes Aside
17 GitHub: Forking and Pull Requests
18 Reverting: Undoing Commits
19 Reset: Moving Branches Around
20 The Reference Log, “reflog”
21 Patch Mode: Applying Partial Changes
22 Cherry-Pick: Bringing in Specific Commits
- 22.1 Cherry-Pick Example
- 22.2 Cherry-Pick Conflicts
23 Who’s to Blame for this Code?
- 23.1 Fancier Blaming
24 Configuration
25 Git Aliases
26 Changing Identity
27 Amending Commits
- 27.1 Amending the Commit Message
- 27.2 Adding some Files to the Commit
28 Difftool
- 28.1 Configuring
- 28.2 Available Difftools
29 Mergetool
30 Submodules
31 Tags
32 Worktrees
33 Appendix: Making a Playground
- 33.1 Cloning Bare Repos
- 33.2 Automating Playground Builds
34 Appendix: Getting Out of Editors
35 Appendix: Errors and Scary Messages
36 Appendix: Just Enough Vim
37 Appendix: Other References
38 Quick Reference

Prev | Contents | Next