Pro Git is written to help the professional developer learn the Git distributed source control tool from front to back. In this book, you'll learn why Git is different and powerful, how to use it from beginning usage to advanced features, how to transition to it from an existing system, and how it works under the covers. The book will also help you master a variety of common workflows, both as a contributor to a Git-based project and as a maintainer of such a project. This book assumes no prior knowledge of Git but will make you an expert, ready to dazzle your friends and impress your coworkers.

Foreword	p. xv
About the Author	p. xvii
About the Technical Reviewer	p. xviii
Acknowledgments	p. xix
Introduction	p. xxi
Getting Started	p. 1
About Version Control	p. 1
Local Version Control Systems	p. 2
Centralized Version Control Systems	p. 3
Distributed Version Control Systems	p. 4
A Short History of Git	p. 5
Git Basics	p. 5
Snapshots, Not Differences	p. 6
Nearly Every Operation Is Local	p. 7
Git Has Integrity	p. 7
Git Generally Only Adds Data	p. 7
The Three States	p. 8
Installing Git	p. 9
Installing from Source	p. 9
Installing on Linux	p. 10
Installing on Mac	p. 10
Installing on Windows	p. 11
First-Time Git Setup	p. 11
Your Identity	p. 11
Your Editor	p. 12
Your Diff Tool	p. 12
Checking Your Settings	p. 12
Getting Help	p. 13
Summary	p. 13
Git Basics	p. 15
Getting a Git Repository	p. 15
Initializing a Repository in an Existing Directory	p. 15
Cloning an Existing Repository	p. 16
Recording Changes to the Repository	p. 16
Checking the Status of Your Files	p. 17
Tracking New Files	p. 18
Staging Modified Files	p. 18
Ignoring Files	p. 20
Viewing Your Staged and Unstaged Changes	p. 20
Committing Your Changes	p. 23
Skipping the Staging Area	p. 24
Removing Files	p. 24
Moving Files	p. 25
Viewing the Commit History	p. 26
Limiting Log Output	p. 30
Using a GUI to Visualize History	p. 31
Undoing Things	p. 32
Changing Your Last Commit	p. 32
Unstaging a Staged File	p. 33
Unmodifying a Modified File	p. 34
Working with Remotes	p. 35
Showing Your Remotes	p. 35
Adding Remote Repositories	p. 36
Fetching and Pulling from Your Remotes	p. 36
Pushing to Your Remotes	p. 37
Inspecting a Remote	p. 37
Removing and Renaming Remotes	p. 38
Tagging	p. 38
Listing Your Tags	p. 39
Creating Tags	p. 39
Verifying Tags	p. 41
Tagging Later	p. 42
Sharing Tags	p. 43
Tips and Tricks	p. 43
Auto-Completion	p. 43
Git Aliases	p. 44
Summary	p. 45
Git Branching	p. 47
What a Branch Is	p. 47
Basic Branching and Merging	p. 53
Basic Branching	p. 53
Basic Merging	p. 57
Basic Merge Conflicts	p. 58
Branch Management	p. 60
Branching Workflows	p. 61
Long-Running Branches	p. 62
Topic Branches	p. 63
Remote Branches	p. 64
Pushing	p. 68
Tracking Branches	p. 69
Deleting Remote Branches	p. 69
Rebasing	p. 70
The Basic Rebase	p. 70
More Interesting Rebases	p. 72
The Perils of Rebasing	p. 74
Summary	p. 77
Git on the Server	p. 79
The Protocols	p. 79
Local Protocol	p. 80
The SSH Protocol	p. 81
The Git Protocol	p. 81
The HTTP/S Protocol	p. 82
Getting Git on a Server	p. 83
Putting the Bare Repository on a Server	p. 84
Small Setups	p. 85
SSH Access	p. 85
Generating Your SSH Public Key	p. 85
Setting Up the Server	p. 86
Public Access	p. 88
GitWeb	p. 90
Gitosis	p. 91
Git Daemon	p. 95
Hosted Git	p. 96
GitHub	p. 97
Setting Up a User Account	p. 97
Creating a New Repository	p. 99
Importing from Subversion	p. 101
Adding Collaborators	p. 102
Your Project	p. 103
Forking Projects	p. 104
GitHub Summary	p. 105
Summary	p. 105
Distributed Git	p. 107
Distributed Workflows	p. 107
Centralized Workflow	p. 107
Integration-Manager Workflow	p. 108
Dictator and Lieutenants Workflow	p. 109
Contributing to a Project	p. 110
Commit Guidelines	p. 111
Private Small Team	p. 112
Private Managed Team	p. 118
Public Small Project	p. 124
Public Large Project	p. 127
Summary	p. 129
Maintaining a Project	p. 130
Working in Topic Branches	p. 130
Applying Patches from E-mail	p. 130
Checking Out Remote Branches	p. 133
Determining What Is Introduced	p. 134
Integrating Contributed Work	p. 135
Tagging Your Releases	p. 140
Generating a Build Number	p. 141
Preparing a Release	p. 141
The Shortlog	p. 142
Summary	p. 142
Git Tools	p. 143
Revision Selection	p. 143
Single Revisions	p. 143
Commit Ranges	p. 147
Interactive Staging	p. 150
Stashing	p. 153
Stashing Your Work	p. 154
Creating a Branch from a Stash	p. 156
Rewriting History	p. 156
Changing the Last Commit	p. 156
Changing Multiple Commit Messages	p. 157
Reordering Commits	p. 158
Squashing a Commit	p. 159
Splitting a Commit	p. 160
The Nuclear Option: filter-branch	p. 160
Debugging with Git	p. 162
File Annotation	p. 162
Binary Search	p. 163
Submodules	p. 165
Starting with Submodules	p. 165
Cloning a Project with Submodules	p. 167
Superprojects	p. 169
Issues with Submodules	p. 169
Subtree Merging	p. 171
Summary	p. 173
Customizing Git	p. 175
Git Configuration	p. 175
Basic Client Configuration	p. 176
Colors in Git	p. 178
External Merge and Diff Tools	p. 179
Formatting and Whitespace	p. 181
Server Configuration	p. 183
Git Attributes	p. 184
Binary Files	p. 184
Keyword Expansion	p. 186
Exporting Your Repository	p. 189
Merge Strategies	p. 190
Git Hooks	p. 190
Installing a Hook	p. 190
Client-Side Hooks	p. 191
Server-Side Hooks	p. 192
An Example Git-Enforced Policy	p. 193
Server-Side Hook	p. 193
Client-Side Hooks	p. 199
Summary	p. 202
Git and Other Systems	p. 203
Git and Subversion	p. 203
git svn	p. 203
Setting Up	p. 204
Getting Started	p. 204
Committing Back to Subversion	p. 206
Pulling in New Changes	p. 207
Git Branching Issues	p. 208
Subversion Branching	p. 209
Subversion Commands	p. 210
Git-Svn Summary	p. 212
Migrating to Git	p. 212
Importing	p. 213
Perforce	p. 214
A Custom Importer	p. 216
Summary	p. 221
Git Internals	p. 223
Plumbing and Porcelain	p. 223
Git Objects	p. 224
Tree Objects	p. 226
Commit Objects	p. 228
Object Storage	p. 231
Git References	p. 232
The HEAD	p. 233
Tags	p. 234
Remotes	p. 235
Packfiles	p. 235
The Refspec	p. 238
Pushing Refspecs	p. 239
Deleting References	p. 240
Transfer Protocols	p. 240
The Dumb Protocol	p. 240
The Smart Protocol	p. 242
Downloading Data	p. 243
Maintenance and Data Recovery	p. 244
Maintenance	p. 244
Data Recovery	p. 245
Removing Objects	p. 247
Summary	p. 250
Appendix Creative Commons Legal Code	p. 251
Index	p. 259
Table of Contents provided by Ingram. All Rights Reserved.

What is included with this book?

The New copy of this book will include any supplemental materials advertised. Please check the title of the book to determine if it should include any access cards, study guides, lab manuals, CDs, etc.

The Used, Rental and eBook copies of this book are not guaranteed to include any supplemental materials. Typically, only the book itself is included. This is true even if the title states it includes any access cards, study guides, lab manuals, CDs, etc.

Amazon no longer offers textbook rentals. We do!

Amazon no longer offers textbook rentals. We do!

We're the #1 textbook rental company. Let us show you why.

Pro Git

9781430218333

1430218339

Supplemental Materials

Summary

Table of Contents

Supplemental Materials

Rewards Program