Index

• 1. Getting Started
  • 1.1. About Version Control
    • 1.1.1. Local Version Control Systems
    • 1.1.2. Centralized Version Control Systems
    • 1.1.3. Distributed Version Control Systems
  • 1.2. A Short History of Git
  • 1.3. Git Basics
    • 1.3.1. Snapshots, Not Differences
    • 1.3.2. Nearly Every Operation Is Local
    • 1.3.3. Git Has Integrity
    • 1.3.4. Git Generally Only Adds Data
    • 1.3.5. The Three States
  • 1.4. Installing Git
    • 1.4.1. Installing from Source
    • 1.4.2. Installing on Linux
    • 1.4.3. Installing on Mac
    • 1.4.4. Installing on Windows
  • 1.5. First-Time Git Setup
    • 1.5.1. Your Identity
    • 1.5.2. Your Editor
    • 1.5.3. Your Diff Tool
    • 1.5.4. Checking Your Settings
  • 1.6. Getting Help
  • 1.7. Summary
• 2. Git Basics
  • 2.1. Getting a Git Repository
    • 2.1.1. Initializing a Repository in an Existing Directory
    • 2.1.2. Cloning an Existing Repository
  • 2.2. Recording Changes to the Repository
    • 2.2.1. Checking the Status of Your Files
    • 2.2.2. Tracking New Files
    • 2.2.3. Staging Modified Files
    • 2.2.4. Ignoring Files
    • 2.2.5. Viewing Your Staged and Unstaged Changes
    • 2.2.6. Committing Your Changes
    • 2.2.7. Skipping the Staging Area
    • 2.2.8. Removing Files
    • 2.2.9. Moving Files
  • 2.3. Viewing the Commit History
    • 2.3.1. Limiting Log Output
    • 2.3.2. Using a GUI to Visualize History
  • 2.4. Undoing Things
    • 2.4.1. Changing Your Last Commit
    • 2.4.2. Unstaging a Staged File
    • 2.4.3. Unmodifying a Modified File
  • 2.5. Working with Remotes
    • 2.5.1. Showing Your Remotes
    • 2.5.2. Adding Remote Repositories
    • 2.5.3. Fetching and Pulling from Your Remotes
    • 2.5.4. Pushing to Your Remotes
    • 2.5.5. Inspecting a Remote
    • 2.5.6. Removing and Renaming Remotes
  • 2.6. Tagging
    • 2.6.1. Listing Your Tags
    • 2.6.2. Creating Tags
    • 2.6.3. Annotated Tags
    • 2.6.4. Signed Tags
    • 2.6.5. Lightweight Tags
    • 2.6.6. Verifying Tags
    • 2.6.7. Tagging Later
    • 2.6.8. Sharing Tags
  • 2.7. Tips and Tricks
    • 2.7.1. Auto-Completion
    • 2.7.2. Git Aliases
  • 2.8. Summary
• 3. Git Branching
  • 3.1. What a Branch Is
  • 3.2. Basic Branching and Merging
    • 3.2.1. Basic Branching
    • 3.2.2. Basic Merging
    • 3.2.3. Basic Merge Conflicts
  • 3.3. Branch Management
  • 3.4. Branching Workflows
    • 3.4.1. Long-Running Branches
    • 3.4.2. Topic Branches
  • 3.5. Remote Branches
    • 3.5.1. Pushing
    • 3.5.2. Tracking Branches
    • 3.5.3. Deleting Remote Branches
  • 3.6. Rebasing
    • 3.6.1. The Basic Rebase
    • 3.6.2. More Interesting Rebases
    • 3.6.3. The Perils of Rebasing
  • 3.7. Summary
• 4. Git on the Server
  • 4.1. The Protocols
    • 4.1.1. Local Protocol
    • 4.1.2. The SSH Protocol
    • 4.1.3. The Git Protocol
    • 4.1.4. The HTTPS Protocol
  • 4.2. Getting Git on a Server
    • 4.2.1. Putting the Bare Repository on a Server
    • 4.2.2. Small Setups
  • 4.3. Generating Your SSH Public Key
  • 4.4. Setting Up the Server
  • 4.5. Public Access
  • 4.6. GitWeb
  • 4.7. Gitosis
  • 4.8. Git Daemon
  • 4.9. Hosted Git
    • 4.9.1. GitHub
    • 4.9.2. Setting Up a User Account
    • 4.9.3. Creating a New Repository
    • 4.9.4. Importing from Subversion
    • 4.9.5. Adding Collaborators
    • 4.9.6. Your Project
    • 4.9.7. Forking Projects
    • 4.9.8. GitHub Summary 4.10 Summary
• 5. Distributed Git
  • 5.1. Distributed Workflows
    • 5.1.1. Centralized Workflow
    • 5.1.2. Integration-Manager Workflow
    • 5.1.3. Dictator and Lieutenants Workflow
  • 5.2. Contributing to a Project
    • 5.2.1. Commit Guidelines
    • 5.2.2. Private Small Team
    • 5.2.3. Private Managed Team
    • 5.2.4. Public Small Project
    • 5.2.5. Public Large Project
    • 5.2.6. Summary
  • 5.3. Maintaining a Project
    • 5.3.1. Working in Topic Branches
    • 5.3.2. Applying Patches from E-mail
    • 5.3.3. Checking Out Remote Branches
    • 5.3.4. Determining What Is Introduced
    • 5.3.5. Integrating Contributed Work
    • 5.3.6. Tagging Your Releases
    • 5.3.7. Generating a Build Number
    • 5.3.8. Preparing a Release
    • 5.3.9. The Shortlog
  • 5.4. Summary
• 6. Git Tools
  • 6.1. Revision Selection
    • 6.1.1. Single Revisions
    • 6.1.2. Short SHA
    • 6.1.3. A SHORT NOTE ABOUT SHA1
    • 6.1.4. Branch References
    • 6.1.5. RefLog Shortnames
    • 6.1.6. Ancestry References
    • 6.1.7. Commit Ranges
  • 6.2. Interactive Staging
    • 6.2.1. Staging and Unstaging Files
    • 6.2.2. Staging Patches
  • 6.3. Stashing
    • 6.3.1. Stashing Your Work
    • 6.3.2. Creating a Branch from a Stash
  • 6.4. Rewriting History
    • 6.4.1. Changing the Last Commit
    • 6.4.2. Changing Multiple Commit Messages
    • 6.4.3. Reordering Commits
    • 6.4.4. Squashing a Commit
    • 6.4.5. Splitting a Commit
    • 6.4.6. The Nuclear Option: filter-branch
  • 6.5. Debugging with Git
    • 6.5.1. File Annotation
    • 6.5.2. Binary Search
  • 6.6. Submodules
    • 6.6.1. Starting with Submodules
    • 6.6.2. Cloning a Project with Submodules
    • 6.6.3. Superprojects
    • 6.6.4. Issues with Submodules
  • 6.7. Subtree Merging
  • 6.8. Summary
• 7. Customizing Git
  • 7.1. Git Configuration
    • 7.1.1. Basic Client Configuration
    • 7.1.2. Colors in Git
    • 7.1.3. External Merge and Diff Tools
    • 7.1.4. Formatting and Whitespace
    • 7.1.5. Server Configuration
  • 7.2. Git Attributes
    • 7.2.1. Binary Files
    • 7.2.2. Keyword Expansion
    • 7.2.3. Exporting Your Repository
    • 7.2.4. Merge Strategies
  • 7.3. Git Hooks
    • 7.3.1. Installing a Hook
    • 7.3.2. Client-Side Hooks
    • 7.3.3. Server-Side Hooks
  • 7.4. An Example Git-Enforced Policy
    • 7.4.1. Server-Side Hook
    • 7.4.2. Client-Side Hooks
  • 7.5. Summary
• 8. Git and Other Systems
  • 8.1. Git and Subversion
    • 8.1.1. git svn
    • 8.1.2. Setting Up
    • 8.1.3. Getting Started
    • 8.1.4. Committing Back to Subversion
    • 8.1.5. Pulling in New Changes
    • 8.1.6. Git Branching Issues
    • 8.1.7. Subversion Branching
    • 8.1.8. Switching Active Branches
    • 8.1.9. Subversion Commands
    • 8.1.1. Git-Svn Summary
  • 8.2. Migrating to Git
    • 8.2.1. Importing
    • 8.2.2. Subversion
    • 8.2.3. Perforce
    • 8.2.4. A Custom Importer
  • 8.3. Summary
• 9. Git Internals
  • 9.1. Plumbing and Porcelain
  • 9.2. Git Objects
    • 9.2.1. Tree Objects
    • 9.2.2. Commit Objects
    • 9.2.3. Object Storage
  • 9.3. Git References
    • 9.3.1. The HEAD
    • 9.3.2. Tags
    • 9.3.3. Remotes
  • 9.4. Packfiles
  • 9.5. The Refspec
    • 9.5.1. Pushing Refspecs
    • 9.5.2. Deleting References
  • 9.6. Transfer Protocols
    • 9.6.1. The Dumb Protocol
    • 9.6.2. The Smart Protocol
  • 9.7. Maintenance and Data Recovery
    • 9.7.1. Maintenance
    • 9.7.2. Data Recovery
    • 9.7.3. Removing Objects
  • 9.8. Summary