This book gets you into the Git mindset, explaining the basic Git model and overall workflow, the Git versions of common source management concepts and commands, how to track changes, work with branches, and take advantage of Git's full functionality, and how to avoid trip-ups and missteps.

Professional Git

Preface

What Is Git?

WHAT'S IN THIS CHAPTER? The differences between a centralized and distributed source management system The differences between a traditional delta model for tracking source code changes and the way that Git tracks changes Why Git is efficient How (and why) Git repositories should be organized Things to keep in mind when migrating repositories to Git Dealing with large files in Git 

Key Concepts

WHAT'S IN THIS CHAPTER? The different levels of Git The workflow for moving content between the levels (the Git promotion model) Why Git has the staging area and how it is used A summary of the commands that you use to move content between the levels 

The Git Promotion Model

WHAT'S IN THIS CHAPTER? Git command syntax and format The differences between porcelain and plumbing commands Working with auto-completion Basic configuration of Git and your user environment Creating a new repository Dealing with line endings with Git The contents of a Git repository Creating Git aliases 

Configuration and Setup

WHAT’S IN THIS CHAPTER? Getting and working with help in Git Understanding the multiple repositories model Staging files Partial and interactive staging Committing files into the local repository Writing good commit messages 

Getting Productive

WHAT'S IN THIS CHAPTER? Using the Git Status and Diff commands Understanding tracked versus untracked files The meaning of HEAD and Cached Tricks and tips for doing different kinds of diffs 

Tracking Changes

WHAT'S IN THIS CHAPTER? Learning about the Git log command Filtering log output Filtering and searching history Working with Git Blame Tagging commits in Git Doing rollbacks with Git Reset Canceling out changes with Git Revert Working with signed tags Using reflogs 

Working with Changes over Time and Using Tags

WHAT'S IN THIS CHAPTER? Understanding branches Implementing branches in Git Branching operations Branching workflows and models Performing checkouts on non-branched commits Working in detached HEAD mode Performing checkouts on individual files 

Working with Local Branches

WHAT'S IN THIS CHAPTER? The Git merge operations Types of merges that Git supports Merge strategies Rebasing Cherry-picking Visual merge tools Different ways to show conflicts Advanced rebasing Interactive rebasing 

Merging Content

WHAT'S IN THIS CHAPTER? Purpose of the Git attributes file Scope and use cases for the Git attributes file Format of the Git attributes file Purpose of the Git ignore file Scope and use cases for the Git ignore file Format of the Git ignore file 

Supporting Files in Git

WHAT'S IN THIS CHAPTER? Stashing work in progress Learning about Git commands to remove and rename files Searching through content and logs in Git Creating patches and external archives of Git content Cleaning up working directories and repositories Adding notes to commits already in the repository Using filter-branch to modify repositories Using bisect to find where something was first introduced Using rerere to remember and replay resolutions to merge conflicts 

Doing More with Git

WHAT'S IN THIS CHAPTER? Understanding the different meanings of remote in Git Using networking protocols with Git Adding and managing remote references Understanding remote tracking branches Learning more about the clone command Establishing connections between local and remote branches Pushing, fetching, and pulling changes 

Understanding Remotes&mdash;Branches and Operations

WHAT’S IN THIS CHAPTER? Dealing with changes from multiple users Resolving conflicts after updating from a remote Rebasing versus merging after a pull Using the fork-and-pull model for collaboration and contribution Stashing, a better way to merge Tying all the workflow pieces together 

Understanding Remotes&mdash;Workflows for Changes

WHAT’S IN THIS CHAPTER? Working with changes in multiple branches simultaneously using worktrees Including repositories as subprojects with submodules Coordinating changes in submodules with the containing project Addressing potential problems when using submodules Incorporating projects as subdirectories with subtrees 

Working with Trees and Modules in Git

WHAT’S IN THIS CHAPTER? Understanding Git hooks Installing hooks Preparing environments for hooks Learning details for each Git hook Exploring hooks written in bash, Groovy, Ruby, Perl, and Python 

Community Questions