Books & Videos

Table of Contents

  1. Chapter 1 Understanding Git

    1. Overview

    2. The Object Store

    3. Object IDs and SHA-1

    4. Where Objects Live

    5. The Commit Graph

    6. Refs

    7. Branches

    8. The Index

    9. Merging

    10. Push and Pull

  2. Chapter 2 Getting Started

    1. Basic Configuration

    2. Creating a New, Empty Repository

    3. Importing an Existing Project

    4. Ignoring Files

  3. Chapter 3 Making Commits

    1. Changing the Index

    2. Making a Commit

  4. Chapter 4 Undoing and Editing Commits

    1. Changing the Last Commit

    2. Discarding the Last Commit

    3. Undoing a Commit

    4. Editing a Series of Commits

  5. Chapter 5 Branching

    1. The Default Branch, master

    2. Making a New Branch

    3. Switching Branches

    4. Deleting a Branch

    5. Renaming a Branch

  6. Chapter 6 Tracking Other Repositories

    1. Cloning a Repository

    2. Local, Remote, and Tracking Branches

    3. Synchronization: Push and Pull

    4. Access Control

  7. Chapter 7 Merging

    1. Merge Conflicts

    2. Details on Merging

    3. Merge Tools

    4. Custom Merge Tools

    5. Merge Strategies

    6. Why the Octopus?

    7. Reusing Previous Merge Decisions

  8. Chapter 8 Naming Commits

    1. Naming Individual Commits

    2. Naming Sets of Commits

  9. Chapter 9 Viewing History

    1. Command Format

    2. Output Formats

    3. Defining Your Own Formats

    4. Limiting Commits to Be Shown

    5. Regular Expressions

    6. Reflog

    7. Decoration

    8. Date Style

    9. Listing Changed Files

    10. Showing and Following Renames or Copies

    11. Rewriting Names and Addresses: The “mailmap”

    12. Searching for Changes: The “pickaxe”

    13. Showing Diffs

    14. Comparing Branches

    15. Showing Notes

    16. Commit Ordering

    17. History Simplification

    18. Related Commands

  10. Chapter 10 Editing History

    1. Rebasing

    2. Importing from One Repository to Another

    3. Commit Surgery: git replace

    4. The Big Hammer: git filter-branch

    5. Notes

  11. Chapter 11 Understanding Patches

    1. Applying Plain Diffs

    2. Patches with Commit Information

  12. Chapter 12 Remote Access

    1. SSH

    2. HTTP

    3. Storing Your Username

    4. Storing Your Password

    5. References

  13. Chapter 13 Miscellaneous

    1. git cherry-pick

    2. git notes

    3. git grep

    4. git rev-parse

    5. git clean

    6. git stash

    7. git show

    8. git tag

    9. git diff

    10. git instaweb

    11. Git Hooks

    12. Visual Tools

    13. Submodules

  14. Chapter 14 How Do I…?

    1. …Make and Use a Central Repository?

    2. …Fix the Last Commit I Made?

    3. …Edit the Previous n Commits?

    4. …Undo My Last n Commits?

    5. …Reuse the Message from an Existing Commit?

    6. …Reapply an Existing Commit from Another Branch?

    7. …List Files with Conflicts when Merging?

    8. …Get a Summary of My Branches?

    9. …Get a Summary of My Working Tree and Index State?

    10. …Stage All the Current Changes to My Working Files?

    11. …Show the Changes to My Working Files?

    12. …Save and Restore My Working Tree and Index Changes?

    13. …Add a Downstream Branch Without Checking It Out?

    14. …List the Files in a Specific Commit?

    15. …Show the Changes Made by a Commit?

    16. …Get Tab Completion of Branch Names, Tags, and So On?

    17. …List All Remotes?

    18. …Change the URL for a Remote?

    19. …Remove Old Remote-Tracking Branches?

    20. …Have git log:

  1. Index