Pragmatic version control using Git

Contents......Page 5
Acknowledgments......Page 9
Preface......Page 10
What's in This Book?......Page 11
Online Resources......Page 13
Welcome to the Distributed World......Page 14
Version Control the Git Way......Page 15
The Repository......Page 16
What Should You Store?......Page 17
Manipulating Files and Staying in Sync......Page 18
Tracking Projects, Directories, and Files......Page 19
Tracking Milestones with Tags......Page 20
Creating Alternate Histories with Branches......Page 21
Merging......Page 22
Locking Options......Page 24
Next Steps......Page 25
Installing Git......Page 26
Configuring Git......Page 31
Using Git's GUI......Page 33
Accessing Git's Built-in Help......Page 34
Creating Your First Project......Page 36
Making Changes......Page 37
Starting to Work with a Project......Page 40
Using and Understanding Branches......Page 43
Handling Releases......Page 44
Cloning a Remote Repository......Page 48
Everyday Git......Page 50
Adding and Committing: Git Basics......Page 51
Adding Files......Page 52
Committing Changes......Page 55
Seeing What Has Changed......Page 58
Managing Files......Page 61
Understanding and Using Branches......Page 65
What Are Branches?......Page 66
Creating a New Branch......Page 67
Merging Changes Between Branches......Page 69
Handling Conflicts......Page 74
Deleting Branches......Page 77
Renaming Branches......Page 78
Working with Git's History......Page 80
Inspecting Git's Log......Page 81
Specifying Revision Ranges......Page 82
Looking at Differences Between Versions......Page 85
Finding Out Who's to Blame......Page 86
Following Content......Page 88
Undoing Changes......Page 91
Rewriting History......Page 94
Network Protocols......Page 100
Cloning a Remote Repository......Page 103
Keeping Up-to-Date......Page 104
Pushing Changes......Page 105
Adding New Remote Repositories......Page 106
Organizing Your Repository......Page 109
Marking Milestones with Tags......Page 110
Handling Release Branches......Page 112
Using Valid Names for Tags and Branches......Page 114
Tracking Multiple Projects......Page 115
Using Git Submodules to Track External Repositories......Page 116
Beyond the Basics......Page 122
Compacting Repository History......Page 123
Exporting Your Repository......Page 124
Rebasing a Branch......Page 125
Using the Reflog......Page 128
Bisecting Your Repository......Page 131
Administration......Page 135
Communicating with SVN......Page 136
Making Sure git-svn Is Available......Page 140
Importing a Subversion Repository......Page 141
Keeping Up-to-Date with a Subversion Repository......Page 143
Pushing Changes to SVN......Page 145
Importing from CVS......Page 146
Running a Git Server with Gitosis......Page 147
Making Sure Dependencies Are Met......Page 148
Creating Administrator Credentials......Page 149
Configuring the Server for Gitosis......Page 150
Configuring Gitosis......Page 151
Adding New Repositories......Page 152
Setting Up a Public Repository......Page 154
Closing Thoughts......Page 155
Appendixes......Page 157
Setup and Initialization......Page 158
Normal Usage......Page 159
Branches......Page 160
History......Page 162
Remote Repositories......Page 164
Git to SVN Bridge......Page 165
Extras Bundled with Git......Page 167
Third-Party Tools......Page 168
Git Repository Hosting......Page 171
Online Resources......Page 172
Bibliography......Page 174
D......Page 175
G......Page 176
R......Page 177
V......Page 178
W......Page 179