Mastering Git

Book License
What You Need
Book Source Code & Forums
Early Access Edition
Chapter 1: Crash Course in Git
Chapter 2: Cloning a Repo
	What is cloning?
	Using GitHub
	Forking
	Key points
	Where to go from here?
Chapter 3: Committing Your Changes
	What is a commit?
	Working trees and staging areas
	Committing your changes
	Adding directories
	Looking at Git log
	Challenge: Add some tutorial ideas
	Key points
	Where to go from here?
Chapter 4: The Staging Area
	Why staging exists
	Undoing staged changes
	Moving files in Git
	Deleting files in Git
	Challenge: Move, delete and restore a file
	Key points
	Where to go from here?
Chapter 5: Ignoring Files in Git
	Introducing .gitignore
	Getting started
	Nesting .gitignore files
	Looking at the global .gitignore
	Finding sample .gitignore files
	Challenge: Populate your local .gitignore
	Key points
	Where to go from here?
Chapter 6: Git Log & History
	Viewing Git history
	Vanilla git log
	Limiting results
	Graphical views of your repository
	Viewing non-ancestral history
	Using Git shortlog
	Searching Git history
	Challenges
	Key points
	Where to go from here?
Chapter 7: Branching
	What is a commit?
	What is a branch?
	Creating a branch
	How Git tracks branches
	Checking your current branch
	Switching to another branch
	Viewing local and remote branches
	Explaining origin
	Viewing branches graphically
	A shortcut for branch creation
	Challenge 1: Delete a branch with commits
	Key points
	Where to go from here?
Chapter 8: Syncing with a Remote
	Pushing your changes
	Pulling changes
	Dealing with multiple remotes
	Key points
	Where to go from here?
Chapter 9: Creating a Repository
	Getting started
	Creating a LICENSE file
	Creating a README file
	Creating and syncing a remote
	Key points
	Where to go from here?
Chapter 10: Merging
	A look at your branches
	Three-way merges
	Merging a branch
	Fast-forward merge
	Forcing merge commits
	Challenge 1: Create a non-fast-forward merge
	Key points
	Where to go from here?
Chapter 11: Stashes
Chapter 12: How Does Git Actually Work?
	Everything is a hash
	The inner workings of Git
	The Git object repository structure
	Viewing Git objects
	Key points
	Where to go from here?
Chapter 13: Merge Conflicts
	What is a merge conflict?
	Handling your first merge conflict
	Merging from another branch
	Understanding Git conflict markers
	Resolving merge conflicts
	Editing conflicts
	Completing the merge operation
	Challenge: Resolve another merge conflict
	Key points
	Where to go from here?
Chapter 14: Demystifying Rebasing
	Why would you rebase?
	What is rebasing?
	Creating your first rebase operation
	A more complex rebase
	Resolving errors
	Challenge
	Key points
Chapter 15: Rebasing to Rewrite History
	Reordering commits
	Interactive rebasing
	Squashing in an interactive rebase
	Creating the squash commit message
	Reordering commits
	Rewording commit messages
	Squashing multiple commits
	Challenge 1: More squashing
	Challenge 2: Rebase your changes onto master
	Key points
	Where to go from here?
Chapter 16: Gitignore After the Fact
	Getting started
	.gitignore across branches
	How Git tracking works
	Updating the index manually
	Removing files from the index
	Rebasing isn’t always the solution
	Using filter-branch to rewrite history
	Challenge: Remove IGNORE_ME from the repository
	Key points
	Where to go from here?
Chapter 17: Cherry Picking
Chapter 18: The Many Faces of Undo
	Working with git reset
	Working with the three flavors of reset
	Using git reflog
	Finding old commits
	Using git revert
	Key points
	Where to go from here?
Chapter 19: Centralized Workflow
	When to use the centralized workflow
	Centralized workflow best practices
	Getting started
	Key points
Chapter 20: Feature Branch Workflow
Chapter 21: Gitflow Workflow
Chapter 22: Forking Workflow
Conclusion