PrefaceChapter 1: Git Basics in Practice An introduction to version control and Git Git by example Repository setup Creating a Git repository Cloning the repository and creating the first commit Publishing changes Examining history and viewing changes Renaming and moving files Updating your repository (with merge) Creating a tag Resolving a merge conflict Adding files in bulk and removing files Undoing changes to a file Creating a new branch Merging a branch (no conflicts) Undoing an unpublished merge SummaryChapter 2: Exploring Project History Directed Acyclic Graphs Whole-tree commits Branches and tags Branch points Merge commits Single revision selection HEAD - the implicit revision Branch and tag references SHA-1 and the shortened SHA-1 identifier Ancestry references Reverse ancestry references: the git describe output Reflog shortnames Upstream of remote-tracking branches Selecting revision by the commit message Selecting the revision range Single revision as a revision range Double dot notation Multiple points -including and excluding revisions The revision range for a single revision Triple-dot notation Searching history Limiting the number of revisions Matching revision metadata Time-limiting options Matching commit contents Commit parents Searching changes in revisions Selecting types of change History of a file Path limiting History simplification Blame - the line-wise history of a file Finding bugs with git bisect Selecting and formatting the git log output Predefined and user defined output formats Including, formatting, and summing up changes Summarizing contributions Viewing a revision and a file at revision SummaryChapter 3: Developing with Git Creating a new commit The DAG view of creating a new commit The index - a staging area for commits Examining the changes to be committed The status of the working directory Examining differences from the last revision Unified Git diff format Selective commit Selecting files to commit Interactively selecting changesChapter 4: Manaqing Your WorktreeChapter 5: Collaborative Development with GitChapter 6: Advanced Branchinq TechniquesChapter 7: Merging Changes TogetherChapter 8: Keeping History CleanChapter 9: Managing Subprojects - Building a Living FrameworkChapter 10: Customizing and Extending GitChapter 11: Git AdministrationChapter 12: Git Best PracticesIndex