book

Pro Git, Second Edition

by Scott Chacon, Ben Straub

November 2014

Intermediate to advanced

456 pages

11h 48m

English

Apress

Read now

Unlock full access

About Version ControlLocal Version Control SystemsCentralized Version Control SystemsDistributed Version Control SystemsA Short History of GitGit BasicsSnapshots, Not DifferencesNearly Every Operation Is LocalGit Has IntegrityGit Generally Only Adds DataThe Three StatesThe Command LineInstalling GitInstalling on LinuxInstalling on MacInstalling on WindowsFirst-Time Git SetupYour IdentityYour EditorChecking Your SettingsGetting HelpSummary

Getting a Git RepositoryInitializing a Repository in an Existing DirectoryCloning an Existing RepositoryRecording Changes to the RepositoryChecking the Status of Your FilesTracking New FilesStaging Modified FilesShort StatusIgnoring FilesViewing Your Staged and Unstaged ChangesCommitting Your ChangesSkipping the Staging AreaRemoving FilesMoving FilesViewing the Commit HistoryLimiting Log OutputUndoing ThingsUnstaging a Staged FileUnmodifying a Modified FileWorking with RemotesShowing Your RemotesAdding Remote RepositoriesFetching and Pulling from Your RemotesPushing to Your RemotesInspecting a RemoteRemoving and Renaming RemotesTaggingListing Your TagsCreating TagsAnnotated TagsLightweight TagsTagging LaterSharing TagsGit AliasesSummary
Branching in a NutshellCreating a New BranchSwitching BranchesBasic Branching and MergingBasic BranchingBasic MergingBasic Merge ConflictsBranch ManagementBranching WorkflowsLong-Running BranchesTopic BranchesRemote BranchesPushingTracking BranchesPullingDeleting Remote BranchesRebasingThe Basic RebaseMore Interesting RebasesThe Perils of RebasingRebase When You RebaseRebase vs. MergeSummary
The ProtocolsLocal ProtocolThe HTTP ProtocolsThe Git ProtocolGetting Git on a ServerPutting the Bare Repository on a ServerSmall SetupsGenerating Your SSH Public KeySetting Up the ServerGit DaemonSmart HTTPGitWebGitLabInstallationAdministrationUsersGroupsProjectsHooksBasic UsageWorking TogetherThird Party Hosted OptionsSummary
Distributed WorkflowsCentralized WorkflowIntegration-Manager WorkflowDictator and Lieutenants WorkflowWorkf lows SummaryContributing to a ProjectCommit GuidelinesPrivate Small TeamPrivate Managed TeamPublic Project, ForkPublic Project, E-MailSummaryMaintaining a ProjectWorking in Topic BranchesApplying Patches from E-mailDetermining What Is IntroducedIntegrating Contributed WorkLarge-Merging WorkflowsRebasing and Cherry Picking WorkflowsRerereTagging Your ReleasesGenerating a Build NumberPreparing a ReleaseThe ShortlogSummary
Account Setup and ConfigurationSSH AccessYour AvatarYour Email AddressesTwo-Factor AuthenticationContributing to a ProjectForking ProjectsThe GitHub FlowCreating a Pull RequestIterating on a Pull RequestAdvanced Pull RequestsMarkdownGitHub Flavored MarkdownMaintaining a ProjectCreating a New RepositoryAdding CollaboratorsManaging Pull RequestsMentions and NotificationsSpecial FilesProject AdministrationManaging an OrganizationOrganization BasicsTeamsAudit LogScripting GitHubHooksThe GitHub APIOctokitSummary
Revision SelectionSingle RevisionsShort SHABranch ReferencesRef?Log ShortnamesAncestry ReferencesCommit RangesInteractive StagingStaging and Unstaging FilesStaging PatchesStashing and CleaningStashing Your WorkCreative StashingUnapplying a StashCreating a Branch from a StashCleaning Your Working DirectorySigning Your WorkGPG IntroductionSigning TagsVerifying TagsSigning CommitsEveryone Must SignSearchingGit GrepGit Log SearchingLine Log SearchRewriting HistoryChanging the Last CommitChanging Multiple Commit MessagesReordering CommitsSquashing a CommitSplitting a CommitThe Nuclear Option: filter-branchReset DemystifiedThe Three TreesThe WorkflowThe Role of ResetReset with a PathSquashingCheck It OutSummaryAdvanced MergingMerge ConflictsAborting a MergeIgnoring WhitespaceManual File Re-mergingChecking Out ConflictsMerge LogCombined Diff FormatUndoing MergesOther Types of MergesRerereDebugging with GitFile AnnotationBinary SearchSubmodulesStarting with SubmodulesCloning a Project with SubmodulesWorking on a Project with SubmodulesPublishing Submodule ChangesMerging Submodule ChangesSubmodule TipsBundlingReplaceCredential Storage
A Custom Credential CacheSummary
Git ConfigurationBasic Client ConfigurationColors in GitExternal Merge and Diff ToolsFormatting and WhitespaceServer ConfigurationGit AttributesBinary FilesKeyword ExpansionExporting Your RepositoryMerge StrategiesGit HooksInstalling a HookClient-Side HooksCommitting-Workflow HooksE-mail Workflow HooksOther Client HooksServer-Side HooksAn Example Git-Enforced PolicyServer-Side HookEnforcing a Specific Commit-Message FormatEnforcing a User-Based ACL SystemTesting It OutClient-Side HooksSummary
Git as a ClientGit and SubversionGit and MercurialGit and PerforceGit and TFSMigrating to GitSubversionMercurialPerforceA Custom ImporterSummary
Plumbing and PorcelainGit ObjectsTree ObjectsCommit ObjectsObject StorageGit ReferencesThe HEADTagsRemotesPackfilesThe RefspecPushing RefspecsDeleting ReferencesTransfer ProtocolsThe Dumb ProtocolThe Smart ProtocolProtocols SummaryMaintenance and Data RecoveryMaintenanceData RecoveryRemoving ObjectsEnvironment VariablesGlobal BehaviorRepository LocationsPathspecsCommittingNetworkingDiffing and MergingDebuggingMiscellaneousSummary
Graphical Interfacesgitk and git-guiGitHub for Mac and WindowsSummaryOther GUIsGit in Visual StudioGit in EclipseGit in BashGit in ZshGit in PowershellSummary
Command-line GitLibgit2Advanced FunctionalityOther BindingsFurther Reading
Setup and Configgit configgit helpGetting and Creating Projectsgit initgit cloneBasic Snapshottinggit addgit statusgit diffgit difftoolgit commitgit resetgit rmgit mvgit cleanBranching and Merginggit branchgit checkoutgit mergegit mergetoolgit loggit stashgit tagSharing and Updating Projectsgit fetchgit pullgit pushgit remotegit archivegit submoduleInspection and Comparisongit showgit shortloggit describeDebugginggit bisectgit blamegit grepPatchinggit cherry-pickgit rebasegit revertEmailgit applygit amgit format-patchgit send-emailgit request-pullExternal Systemsgit svngit fast-importAdministrationgit gcgit fsckgit refloggit filter-branchPlumbing Commands

Overview

Pro Git (Second Edition) is your fully-updated guide to Git and its usage in the modern world. Git has come a long way since it was first developed by Linus Torvalds for Linux kernel development. It has taken the open source world by storm since its inception in 2005, and this book teaches you how to use it like a pro.

Effective and well-implemented version control is a necessity for successful web projects, whether large or small. With this book you’ll learn how to master the world of distributed version workflow, use the distributed features of Git to the full, and extend Git to meet your every need.

Written by Git pros Scott Chacon and Ben Straub, Pro Git (Second Edition) builds on the hugely successful first edition, and is now fully updated for Git version 2.0, as well as including an indispensable chapter on GitHub. It’s the best book for all your Git needs.