book

Pro Git

Name: Pro Git
Author: Scott Chacon
ISBN: 9781430218333

by Scott Chacon

August 2009

Intermediate to advanced

287 pages

6h 58m

English

Apress

Read now

Unlock full access

Copyright
Foreword
About the Author
About the Technical Reviewer
Acknowledgments
Introduction
1. Getting Started
1.1. About Version Control1.2. Local Version Control Systems1.3. Centralized Version Control Systems1.4. Distributed Version Control Systems1.5. A Short History of Git1.6. Git Basics1.6.1. Snapshots, Not Differences1.6.2. Nearly Every Operation Is Local1.6.3. Git Has Integrity1.6.4. Git Generally Only Adds Data1.6.5. The Three States1.7. Installing Git1.7.1. Installing from Source1.7.2. Installing on Linux1.7.3. Installing on Mac1.7.4. Installing on Windows1.8. First-Time Git Setup1.8.1. Your Identity1.8.2. Your Editor1.8.3. Your Diff Tool1.8.4. Checking Your Settings1.9. Getting Help1.10. Summary
2. Git Basics
2.1. Getting a Git Repository2.1.1. Initializing a Repository in an Existing Directory2.1.2. Cloning an Existing Repository2.2. Recording Changes to the Repository2.2.1. Checking the Status of Your Files2.2.2. Tracking New Files2.2.3. Staging Modified Files2.2.4. Ignoring Files2.2.5. Viewing Your Staged and Unstaged Changes2.2.6. Committing Your Changes2.2.7. Skipping the Staging Area2.2.8. Removing Files2.2.9. Moving Files2.3. Viewing the Commit History2.3.1. Limiting Log Output2.3.2. Using a GUI to Visualize History2.4. Undoing Things2.4.1. Changing Your Last Commit2.4.2. Unstaging a Staged File2.4.3. Unmodifying a Modified File2.5. Working with Remotes2.5.1. Showing Your Remotes2.5.2. Adding Remote Repositories2.5.3. Fetching and Pulling from Your Remotes2.5.4. Pushing to Your Remotes2.5.5. Inspecting a Remote2.5.6. Removing and Renaming Remotes2.6. Tagging2.6.1. Listing Your Tags2.6.2. Creating Tags2.6.2.1. Annotated Tags2.6.2.2. Signed Tags2.6.2.3. Lightweight Tags2.6.3. Verifying Tags2.6.4. Tagging Later2.6.5. Sharing Tags2.7. Tips and Tricks2.7.1. Auto-Completion2.7.2. Git Aliases2.8. Summary
3. Git Branching
3.1. What a Branch Is3.2. Basic Branching and Merging3.2.1. Basic Branching3.2.2. Basic Merging3.2.3. Basic Merge Conflicts3.3. Branch Management3.4. Branching Workflows3.4.1. Long-Running Branches3.4.2. Topic Branches3.5. Remote Branches3.5.1. Pushing3.5.2. Tracking Branches3.5.3. Deleting Remote Branches3.6. Rebasing3.6.1. The Basic Rebase3.6.2. More Interesting Rebases3.6.3. The Perils of Rebasing3.7. Summary
4. Git on the Server
4.1. The Protocols4.1.1. Local Protocol4.1.1.1. The Pros4.1.1.2. The Cons4.1.2. The SSH Protocol4.1.2.1. The Pros4.1.2.2. The Cons4.1.3. The Git Protocol4.1.3.1. The Pros4.1.3.2. The Cons4.1.4. The HTTP/S Protocol4.1.4.1. The Pros4.1.4.2. The Cons4.2. Getting Git on a Server4.2.1. Putting the Bare Repository on a Server4.3. Small Setups4.3.1. SSH Access4.3.2. Generating Your SSH Public Key4.3.3. Setting Up the Server4.3.4. Public Access4.3.5. GitWeb4.4. Gitosis4.4.1. Git Daemon4.5. Hosted Git4.5.1. GitHub4.5.2. Setting Up a User Account4.5.3. Creating a New Repository4.5.4. Importing from Subversion4.5.5. Adding Collaborators4.5.6. Your Project4.5.7. Forking Projects4.5.8. GitHub Summary4.6. Summary

5. Distributed Git
5.1. Distributed Workflows5.1.1. Centralized Workflow5.1.2. Integration-Manager Workflow5.1.3. Dictator and Lieutenants Workflow5.2. Contributing to a Project5.2.1. Commit Guidelines5.2.2. Private Small Team5.2.3. Private Managed Team5.2.4. Public Small Project5.2.5. Public Large Project5.2.6. Summary5.3. Maintaining a Project5.3.1. Working in Topic Branches5.3.2. Applying Patches from E-mail5.3.2.1. Applying a Patch with apply5.3.2.2. Applying a Patch with am5.3.3. Checking Out Remote Branches5.3.4. Determining What Is Introduced5.3.5. Integrating Contributed Work5.3.5.1. Merging Workflows5.3.5.2. Large-Merging Workflows5.3.5.3. Rebasing and Cherry-Picking Workflows5.3.6. Tagging Your Releases5.3.7. Generating a Build Number5.3.8. Preparing a Release5.3.9. The Shortlog5.4. Summary
6. Git Tools
6.1. Revision Selection6.1.1. Single Revisions6.1.1.1. Short SHA6.1.1.2. Branch References6.1.1.3. RefLog Shortnames6.1.1.4. Ancestry References6.1.2. Commit Ranges6.1.2.1. Double Dot6.1.2.2. Multiple Points6.1.2.3. Triple Dot6.2. Interactive Staging6.2.1.6.2.1.1. Staging and Unstaging Files6.2.1.2. Staging Patches6.3. Stashing6.3.1. Stashing Your Work6.3.2. Creating a Branch from a Stash6.4. Rewriting History6.4.1. Changing the Last Commit6.4.2. Changing Multiple Commit Messages6.4.3. Reordering Commits6.4.4. Squashing a Commit6.4.5. Splitting a Commit6.4.6. The Nuclear Option: filter-branch6.4.6.1. Removing a File from Every Commit6.4.6.2. Making a Subdirectory the New Root6.4.6.3. Changing E-mail Addresses Globally6.5. Debugging with Git6.5.1. File Annotation6.5.2. Binary Search6.6. Submodules6.6.1. Starting with Submodules6.6.2. Cloning a Project with Submodules6.6.3. Superprojects6.6.4. Issues with Submodules6.7. Subtree Merging6.8. Summary
7. Customizing Git
7.1. Git Configuration7.1.1. Basic Client Configuration7.1.1.1. core.editor7.1.1.2. commit.template7.1.1.3. core.pager7.1.1.4. user.signingkey7.1.1.5. core.excludesfile7.1.1.6. help.autocorrect7.1.2. Colors in Git7.1.2.1. color.ui7.1.2.2. color.*7.1.3. External Merge and Diff Tools7.1.4. Formatting and Whitespace7.1.4.1. core.autocrlf7.1.4.2. core.whitespace7.1.5. Server Configuration7.1.5.1. receive.fsckObjects7.1.5.2. receive.denyNonFastForwards7.1.5.3. receive.denyDeletes7.2. Git Attributes7.2.1. Binary Files7.2.1.1. Identifying Binary Files7.2.1.2. Diffing Binary Files7.2.2. Keyword Expansion7.2.3. Exporting Your Repository7.2.3.1. export-ignore7.2.3.2. export-subst7.2.4. Merge Strategies7.3. Git Hooks7.3.1. Installing a Hook7.3.2. Client-Side Hooks7.3.2.1. Committing-Workflow Hooks7.3.2.2. E-mail Workflow Hooks7.3.2.3. Other Client Hooks7.3.3. Server-Side Hooks7.3.3.1. pre-receive and post-receive7.3.3.2. update7.4. An Example Git-Enforced Policy7.4.1. Server-Side Hook7.4.1.1. Enforcing a Specific Commit-Message Format7.4.1.2. Enforcing a User-Based ACL System7.4.1.3. Enforcing Fast-Forward-Only Pushes7.4.2. Client-Side Hooks7.5. Summary
8. Git and Other Systems
8.1. Git and Subversion8.1.1. git svn8.1.2. Setting Up8.1.3. Getting Started8.1.4. Committing Back to Subversion8.1.5. Pulling in New Changes8.1.6. Git Branching Issues8.1.7. Subversion Branching8.1.7.1. Creating a New SVN Branch8.1.7.2. Switching Active Branches8.1.8. Subversion Commands8.1.8.1. SVN Style History8.1.8.2. SVN Annotation8.1.9. SVN Server Information8.1.9.1. Ignoring What Subversion Ignores8.1.10. Git-Svn Summary8.2. Migrating to Git8.2.1. Importing8.2.1.1. Subversion8.2.2. Perforce8.2.3. A Custom Importer8.2.4. Summary
9. Git Internals
9.1. Plumbing and Porcelain9.2. Git Objects9.2.1. Tree Objects9.2.2. Commit Objects9.2.3. Object Storage9.3. Git References9.3.1. The HEAD9.3.2. Tags9.3.3. Remotes9.4. Packfiles9.4.1. The Refspec9.4.2. Pushing Refspecs9.4.3. Deleting References9.5. Transfer Protocols9.5.1. The Dumb Protocol9.5.2. The Smart Protocol9.5.2.1. Uploading Data9.5.3. Downloading Data9.6. Maintenance and Data Recovery9.6.1. Maintenance9.6.2. Data Recovery9.6.3. Removing Objects9.7. Summary
A. Creative Commons Legal Code
A.1. Attribution-NonCommercial-ShareAlike 3.0 UnportedA.2. LicenseA.3. Creative Commons Notice

Content preview from Pro Git

Chapter 8. Git and Other Systems

The world isn't perfect. Usually, you can't immediately switch every project you come in contact with to Git. Sometimes you're stuck on a project using another VCS, and many times that system is Subversion. You'll spend the first part of this chapter learning about git svn, the bidirectional Subversion gateway tool in Git.

At some point, you may want to convert your existing project to Git. The second part of this chapter covers how to migrate your project into Git: first from Subversion, then from Perforce, and finally via a custom import script for a nonstandard importing case.

Git and Subversion

Currently, the majority of open source development projects and a large number of corporate projects use Subversion to ...

Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.

Read now

Unlock full access

More than 5,000 organizations count on O’Reilly

O’Reilly covers everything we've got, with content to help us build a world-class technology community, upgrade the capabilities and competencies of our teams, and improve overall team performance as well as their engagement.

Julian F.

Head of Cybersecurity

I wanted to learn C and C++, but it didn't click for me until I picked up an O'Reilly book. When I went on the O’Reilly platform, I was astonished to find all the books there, plus live events and sandboxes so you could play around with the technology.

Addison B.

Field Engineer

I’ve been on the O’Reilly platform for more than eight years. I use a couple of learning platforms, but I'm on O'Reilly more than anybody else. When you're there, you start learning. I'm never disappointed.

Amir M.

Data Platform Tech Lead

I'm always learning. So when I got on to O'Reilly, I was like a kid in a candy store. There are playlists. There are answers. There's on-demand training. It's worth its weight in gold, in terms of what it allows me to do.

Mark W.

Embedded Software Engineer

Publisher Resources

ISBN: 9781430218333Purchase book

Cloud Computing

Data Engineering

Data Science

AI & ML

Programming Languages

Software Architecture

IT/Ops

Security

Design

Business

Soft Skills

Pro Git

by Scott Chacon

Chapter 8. Git and Other Systems

Git and Subversion

Become an O’Reilly member and get unlimited access to this title plus top books and audiobooks from O’Reilly and nearly 200 top publishers, thousands of courses curated by job role, 150+ live events each month,
and much more.