book

Version Control with Git, 2nd Edition

by Jon Loeliger, Matthew McCullough

August 2012

Intermediate to advanced

452 pages

12h 39m

English

O'Reilly Media, Inc.

Read now

Unlock full access

Preface
AudienceAssumed FrameworkBook Layout and OmissionsConventions Used in This BookUsing Code ExamplesSafari® Books OnlineHow to Contact UsAcknowledgmentsAttributions
1. Introduction
BackgroundThe Birth of GitPrecedentsTimelineWhat’s in a Name?
2. Installing Git
Using Linux Binary DistributionsDebian/UbuntuOther Binary DistributionsObtaining a Source ReleaseBuilding and InstallingInstalling Git on WindowsInstalling the Cygwin Git PackageInstalling Standalone Git (msysGit)
3. Getting Started
The Git Command LineQuick Introduction to Using GitCreating an Initial RepositoryAdding a File to Your RepositoryConfiguring the Commit AuthorMaking Another CommitViewing Your CommitsViewing Commit DifferencesRemoving and Renaming Files in Your RepositoryMaking a Copy of Your RepositoryConfiguration FilesConfiguring an AliasInquiry
4. Basic Git Concepts
Basic ConceptsRepositoriesGit Object TypesIndexContent-Addressable NamesGit Tracks ContentPathname Versus ContentPack FilesObject Store PicturesGit Concepts at WorkInside the .git DirectoryObjects, Hashes, and BlobsFiles and TreesA Note on Git’s Use of SHA1Tree HierarchiesCommitsTags
5. File Management and the Index
It’s All About the IndexFile Classifications in GitUsing git addSome Notes on Using git commitUsing git commit --allWriting Commit Log MessagesUsing git rmUsing git mvA Note on Tracking RenamesThe .gitignore FileA Detailed View of Git’s Object Model and Files
6. Commits
Atomic ChangesetsIdentifying CommitsAbsolute Commit Namesrefs and symrefsRelative Commit NamesCommit HistoryViewing Old CommitsCommit GraphsUsing gitk to View the Commit GraphCommit RangesFinding CommitsUsing git bisectUsing git blameUsing Pickaxe
7. Branches
Reasons for Using BranchesBranch NamesDos and Don’ts in Branch NamesUsing BranchesCreating BranchesListing Branch NamesViewing BranchesChecking out BranchesA Basic Example of Checking out a BranchChecking out When You Have Uncommitted ChangesMerging Changes into a Different BranchCreating and Checking out a New BranchDetached HEAD BranchesDeleting Branches
8. Diffs
Forms of the git diff CommandSimple git diff Examplegit diff and Commit Rangesgit diff with Path LimitingComparing How Subversion and Git Derive diffs
9. Merges
Merge ExamplesPreparing for a MergeMerging Two BranchesA Merge with a ConflictWorking with Merge ConflictsLocating Conflicted FilesInspecting Conflictsgit diff with conflictsgit log with conflictsHow Git Keeps Track of ConflictsFinishing Up a Conflict ResolutionAborting or Restarting a MergeMerge StrategiesDegenerate MergesNormal MergesRecursive mergesOctopus mergesSpecialty MergesApplying Merge StrategiesMerge DriversHow Git Thinks About MergesMerges and Git’s Object ModelSquash MergesWhy Not Just Merge Each Change One by One?

10. Altering Commits
Caution About Altering HistoryUsing git resetUsing git cherry-pickUsing git revertreset, revert, and checkoutChanging the Top CommitRebasing CommitsUsing git rebase -irebase Versus merge
11. The Stash and the Reflog
The StashThe Reflog
12. Remote Repositories
Repository ConceptsBare and Development RepositoriesRepository ClonesRemotesTracking BranchesReferencing Other RepositoriesReferring to Remote RepositoriesThe refspecExample Using Remote RepositoriesCreating an Authoritative RepositoryMake Your Own Origin RemoteDeveloping in Your RepositoryPushing Your ChangesAdding a New DeveloperGetting Repository UpdatesThe fetch stepThe merge or rebase stepShould you merge or rebase?Remote Repository Development Cycle in PicturesCloning a RepositoryAlternate HistoriesNon–Fast-Forward PushesFetching the Alternate HistoryMerging HistoriesMerge ConflictsPushing a Merged HistoryRemote ConfigurationUsing git remoteUsing git configUsing Manual EditingWorking with Tracking BranchesCreating Tracking BranchesAhead and BehindAdding and Deleting Remote BranchesBare Repositories and git push
13. Repository Management
A Word About ServersPublishing RepositoriesRepositories with Controlled AccessRepositories with Anonymous Read AccessPublishing repositories using git-daemonPublishing repositories using an HTTP daemonPublishing a repository using Smart HTTPPublishing via Git and HTTP daemonsRepositories with Anonymous Write AccessPublishing Your Repository to GitHubRepository Publishing AdviceRepository StructureThe Shared Repository StructureDistributed Repository StructureRepository Structure ExamplesLiving with Distributed DevelopmentChanging Public HistorySeparate Commit and Publish StepsNo One True HistoryKnowing Your PlaceUpstream and Downstream FlowsThe Maintainer and Developer RolesMaintainer–Developer InteractionRole DualityWorking with Multiple RepositoriesYour Own WorkspaceWhere to Start Your RepositoryConverting to a Different Upstream RepositoryUsing Multiple Upstream RepositoriesForking ProjectsIsn’t forking a project bad?Reconciling forksForking projects at GitHub
14. Patches
Why Use Patches?Generating PatchesPatches and Topological SortsMailing PatchesApplying PatchesBad PatchesPatching Versus Merging
15. Hooks
Installing HooksExample HooksCreating Your First HookAvailable HooksCommit-Related HooksPatch-Related HooksPush-Related HooksOther Local Repository Hooks
16. Combining Projects
The Old Solution: Partial CheckoutsThe Obvious Solution: Import the Code into Your ProjectImporting Subprojects by CopyingImporting Subprojects with git pull -s subtreeSubmitting Your Changes UpstreamThe Automated Solution: Checking out Subprojects Using Custom ScriptsThe Native Solution: gitlinks and git submoduleGitlinksThe git submodule Command
17. Submodule Best Practices
Submodule CommandsWhy Submodules?Submodules PreparationWhy Read Only?Why Not Read Only?Examining the Hashes of Submodule CommitsCredential ReuseUse CasesMultilevel Nesting of ReposSubmodules on the Horizon
18. Using Git with Subversion Repositories
Example: A Shallow Clone of a Single BranchMaking Your Changes in GitFetching Before CommittingCommitting Through git svn rebasePushing, Pulling, Branching, and Merging with git svnKeeping Your Commit IDs StraightCloning All the BranchesSharing Your RepositoryMerging Back into SubversionHow dcommit handles mergesMiscellaneous Notes on Working with Subversionsvn:ignore Versus .gitignoreReconstructing the git-svn Cache
19. Advanced Manipulations
Using git filter-branchExamples Using git filter-branchUsing git filter-branch to expunge a fileUsing filter-branch to edit a commit messagefilter-branch PitfallsHow I Learned to Love git rev-listDate-Based CheckoutDate-based checkout cautionsRetrieve Old Version of a FileInteractive Hunk StagingRecovering a Lost CommitThe git fsck CommandReconnecting a Lost Commit
20. Tips, Tricks, and Techniques
Interactive Rebase with a Dirty Working DirectoryRemove Left-Over Editor FilesGarbage CollectionSplit a RepositoryTips for Recovering CommitsSubversion Conversion TipsGeneral AdviceRemove a Trunk After an SVN ImportRemoving SVN Commit IDsManipulating Branches from Two RepositoriesRecovering from an Upstream RebaseMake Your Own Git CommandQuick Overview of ChangesCleaning UpUsing git-grep to Search a RepositoryUpdating and Deleting refsFollowing Files that MovedKeep, But Don’t Track, This FileHave You Been Here Before?
21. Git and GitHub
Repo for Public CodeCreating a GitHub RepositorySocial Coding on Open SourceWatchersNews FeedForksCreating Pull RequestsManaging Pull RequestsNotificationsFinding Users, Projects, and CodeWikisGitHub Pages (Git for Websites)In-Page Code EditorSubversion BridgeTags Automatically Becoming ArchivesOrganizationsREST APISocial Coding on Closed SourceEventual Open SourcingCoding ModelsGitHub EnterpriseGitHub in Sum
Index
About the Authors
Colophon
Copyright

Content preview from Version Control with Git, 2nd Edition

Chapter 21. Git and GitHub

Although the other chapters of this book have focused on the Git command line tool, the years since the 2005 inception of Git have allowed and fostered the growth of a community of tools around it. Those tools number in the hundreds and take on many forms, from desktop GUIs like SmartGit to disk backup tools like SparkleShare. But out of this ocean of Git tooling, one stands at the forefront of the mind of many developers and even nondevelopers: GitHub.

This website, shown in Figure 21-1, introduced the phrase that seemed dismissible just a few years ago, but now feels like the way many of us should consider working: social coding. This model of social coding was first applied to open source, but the last two years have seen this idea of code as a point of geographically distributed collaboration grow even in the closed source enterprise. Let’s take a look at what GitHub has to offer.

Figure 21-1. GitHub homepage

Repo for Public Code

Statistics indicate that the first interaction that many developers have with Git is in cloning a repository from GitHub. This is the original function of GitHub. It offers an interface to repositories over the git://, https://, and git+ssh:// protocols. Accounts are free for open source projects and all accounts can create unlimited publicly accessible repositories. This has greatly fostered the adoption of Git within the open ...

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: 9781449345037Errata Page

Cloud Computing

Data Engineering

Data Science

AI & ML

Programming Languages

Software Architecture

IT/Ops

Security

Design

Business

Soft Skills

Version Control with Git, 2nd Edition

by Jon Loeliger, Matthew McCullough

Chapter 21. Git and GitHub

Repo for Public Code

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.