Jump Start Git

Jump Start Git, Second Edition
Notice of Rights
Notice of Liability
Trademark Notice
About Shaumik Daityari
About SitePoint
Table of Contents
Preface
	Who Should Read This Book?
	Conventions Used
		Code Samples
		Tips, Notes, and Warnings
			Hey, You!
			Ahem, Excuse Me ...
			Make Sure You Always ...
			Watch Out!
	Supplementary Materials
Introduction
	Version Control
		Version Control Doesn’t Replace the Need for a Regular Backup Solution
	Examples of Version Control in Daily Life
	Version Control Systems: the Options
		VCS Is Not CVS
	Enter Git
		Git’s Philosophy
		Advantages of Distributed Version Control Systems
	Git and GitHub
	Conclusion
		What Have You Learned?
		What’s Next?
Getting Started with Git
	Installation
		GUI Tools
	The Git Workflow
	Baby Steps with Git: First Commands
		Set Configuration Settings
		Create a Git Project
			Issuing Git Commands
			Git Autocomplete
		Create Our First Commit
			Don’t Edit .git
			Demonstration Only
			Checking the Status
			Beware of Adding Unwanted Files
			Make Your Commit Messages Meaningful!
	Further Commits with Git
		Diff Only Shows Changes in Tracked Files
		Beware of Shortcuts
		Always Review Your Changes
		Why git add Again?
	Commit History
	The .gitignore File
		Unintentionally Tracking a File Listed in .gitignore
		Hiding .gitignore from Git
		Set up Your .gitignore Early
	Remote Repositories
		GitHub Isn’t the Only Option
	Conclusion
		What Have You Learned?
		What’s Next?
Branching in Git
	What Are Branches?
		Branch Conventions
	Create a Branch
		What Does checkout Do?
	Delete a Branch
		Don’t Delete Branches Unless You Have To
		Branches and HEAD
	Advanced Branching: Merging Branches
		Watch Out for Loops
	Conclusion
		What Have You Learned?
		What’s Next?
Using Git in a Team
		The Source Is the origin
	Optional: Different Protocols While Cloning
		Alternative Credential Storage
		Git GUI Tools Can Generate Keys for You
	Contributing to the Remote: Git Push Revisited
		You Can Delete Branches Using git push
	Keeping Yourself Updated with the Remote: Git Pull
		Pulls Are Fast-forward by Default
		Here Be Conflicts!
	Dealing with a Rejected Git Push
		Rebase?
	Conflicts
		Multiple Conflicts
		Aborting a Merge with Conflicts
	Conclusion
		What Have You Learned?
		What’s Next?
Git Workflows
	The Centralized Workflow
		Features
		New Team Member Orientation
		Pros and Cons
		Who Should Use the Centralized Workflow
	The Feature-branch Workflow
		Features
		New Team Member Orientation
		Pros and Cons
		Who Should Use the Feature-branch Workflow
	Gitflow Workflow
		Features
		New Team Member Orientation
		Pros and Cons
		Who Should Use the Gitflow Workflow
	Forking Workflow
		Features
		New Team Member Orientation
		Pros and Cons
		Who Should Use the Forking Workflow
	Conclusion
		What Have You Learned?
		What’s Next?
Correcting Errors While Working with Git
	Amending Errors in the Git Workflow
		Undo Git Add
			Why Can’t I Just Delete the File?
			Forced Removal
			What Does checkout Really Do?
		Undo Git Commit
			What’s with HEAD~1?
		Undo Git Push
			Use -f with Caution
	Debugging Tools
		Git Blame
		Git Bisect
			Why is git bisect So Fast?
			Learn More About Each Commit
		Automated Bisect with Unit Tests
			Exit Codes in Custom Shell Scripts
			Beware of Using Old Test Files
	Conclusion
		What Have You Learned?
		What’s Next?
Unlocking Git’s Full Potential
	Advanced Use of log
		Short Version
		Branches and History
		Filter Commits
			You Must Specify a Range
		Trace Changes in a Single File
			How Is Tracing Different from git blame?
		Track Your Peers
		Search in Commit Messages
			The Importance of Meaningful Commit Messages
			Using the grep Terminal Command
	Tagging in Git
	Refs and reflog
		reflog Can Act as Insurance
		reflog Only Tracks Commits for a Certain Period of Time
	Checking for Lost Commits
		Not to be Confused with the Unix Command
		fsck versus reflog
	Rebase
		Working in a Team
		Just for Illustration
		Squash Commits Together
			Aborting a Squash
			Squash Modifies the Branch History
	Stash Changes
		stash Untracked Files
	Advanced Use of add
		Don’t Commit with the -a Option
	Cherry Pick
		How Does cherry-pick Differ from merge or rebase?
	GitHub CLI
	Conclusion
		What Have You Learned?
		What’s Next?
Integrate Git in Your Development Cycle
	Git and DevOps
	Using Git Hooks
	Integrating Travis CI with GitHub
		Getting Started with Travis CI
		Travis CI Build Results
		Advanced Configuration Settings
	Conclusion
		What Have You Learned?
		What’s Next?
Git GUI Tools
	GitHub Desktop
		Not Just for GitHub
	Sourcetree
	Sourcetree versus GitHub Desktop
	Conclusion
Conclusion
	Git’s Meteoric Rise
	Will Git Continue to be Popular in the Future?
	Beyond Source Code Management
	The End