book

Git Pocket Guide

by Richard E. Silverman

July 2013

Beginner

231 pages

4h 23m

English

O'Reilly Media, Inc.

Read now

Unlock full access

What Is Git?Goals of This BookConventions Used in This BookUnixShellCommand SyntaxTypographyUsing Code ExamplesSafari® Books OnlineHow to Contact UsAcknowledgments
OverviewTerminologyBranchesSharing WorkThe Object StoreBlobTreeCommitAuthor versus CommitterCryptographic SignatureTagObject IDs and SHA-1SecurityWhere Objects LiveThe Commit GraphRefsRelated CommandsBranchesThe IndexMergingMerging ContentMerging HistoryPush and PullNotes
Basic ConfigurationPersonal IdentificationText EditorCommit ID AbbreviationPaginationColorCryptographic KeysCommand AliasesGetting HelpReferencesCreating a New, Empty RepositorySelected OptionsImporting an Existing ProjectIgnoring FilesSyntax of “Ignore Patterns”
Changing the IndexAdding a New FileAdding the Changes to an Existing FileAdding Partial ChangesShortcutsRemoving a FileRenaming a FileUnstaging ChangesMaking a CommitCommit MessagesWhat Makes a Good Commit?ShortcutsEmpty DirectoriesA Commit Workflow
Changing the Last CommitDouble Oops!Discarding the Last CommitDiscarding Any Number of CommitsUndoing a CommitPartial UndoEditing a Series of CommitsConflictsThe exec Action
The Default Branch, masterMaking a New BranchSwitching BranchesUncommitted ChangesCheck Out with MergeUntracked FilesLosing Your HeadDeleting a BranchRenaming a Branch
Cloning a RepositoryClones and Hard LinksShared CloneBare RepositoriesReference RepositoriesLocal, Remote, and Tracking BranchesSynchronization: Push and PullPullingPushingPush DefaultsPull with RebaseNotesAccess Control
Merge ConflictsResolving Merge ConflictsNotesDetails on MergingMerge ToolsNotesCustom Merge ToolsMerge StrategiesWhy the Octopus?Reusing Previous Merge Decisions
Naming Individual CommitsCommit IDRef NameNames Relative to a Given CommitNames Relative to the ReflogThe Upstream BranchMatching a Commit MessageNotesFollowing ChainsAddressing PathnamesNaming Sets of Commits
Command FormatOutput FormatsDefining Your Own FormatsNotesLimiting Commits to Be ShownRegular ExpressionsReflogDecorationDate StyleListing Changed FilesShowing and Following Renames or CopiesDetecting CopiesRewriting Names and Addresses: The “mailmap”Shortening NamesSearching for Changes: The “pickaxe”Showing DiffsColorWord DiffComparing BranchesDisplaying SidesShowing NotesCommit OrderingHistory SimplificationRelated Commandsgit cherrygit shortlog

RebasingUndoing a RebaseImporting from One Repository to AnotherImporting Disconnected HistoryImporting Linear HistoryImporting Nonlinear HistoryCommit Surgery: git replaceKeeping It RealThe Big Hammer: git filter-branchExamplesExpunging FilesShifting to a SubdirectoryUpdating TagsNotes
Applying Plain DiffsPatches with Commit Information
SSHHTTPStoring Your UsernameStoring Your PasswordReferences
git cherry-pickgit notesgit notes Subcommandsgit grepCombining Regular ExpressionsWhat to SearchWhat to ShowHow to Matchgit rev-parsegit cleangit stashSubcommandssavelistshowpopapplybranch <branchname> [stash]drop [stash]cleargit showgit tagDeleting a Tag from a RemoteFollowing TagsBackdating Tagsgit diffgit diffgit diff --stagedgit diff <commit>git diff <A> <B>Options and Argumentsgit instawebGit HooksVisual ToolsSubmodules
…Make and Use a Central Repository?…Fix the Last Commit I Made?…Edit the Previous n Commits?…Undo My Last n Commits?…Reuse the Message from an Existing Commit?…Reapply an Existing Commit from Another Branch?…List Files with Conflicts when Merging?…Get a Summary of My Branches?…Get a Summary of My Working Tree and Index State?…Stage All the Current Changes to My Working Files?…Show the Changes to My Working Files?…Save and Restore My Working Tree and Index Changes?…Add a Downstream Branch Without Checking It Out?…List the Files in a Specific Commit?…Show the Changes Made by a Commit?…Get Tab Completion of Branch Names, Tags, and So On?…List All Remotes?…Change the URL for a Remote?…Remove Old Remote-Tracking Branches?…Have git log:Find Commits I Made but Lost?Not Show the diffs for Root Commits?Show the Changes for Each Commit?Show the Committer as well as the Author?

Content preview from Git Pocket Guide

Chapter 5. Branching

Now that you know how to create a repository and commit to a single branch, it’s time to learn about using multiple branches. Branches allow different versions of the same content to evolve independently at the same time, while you periodically recombine the contributions from different branches in a process called “merging.” When you switch from one branch to another, Git updates your working tree to reflect the state of the repository content in the tip commit of the new branch.

A typical use for a branch is to work on a new software feature in isolation, without adding it to the main line of development of the project; these are often called “feature” or “topic” branches. You work on the feature branch while developing that feature, and switch to the master branch to work on the main project (which does not yet contain the new feature code). Periodically, you merge master into your feature branch, so you’re working on up-to-date code and notice and resolve any conflicts. When the feature is ready, you do the opposite: merge the feature branch into master, adding the new code to the main version of the project.

Another use for multiple branches is to continue maintenance on older versions of software. When you release version 1.0 of your product, it gets its own branch. Product development continues, but you may need to apply bug fixes or new features to that version even after you’ve released 2.0, for customers who are still using the older version; the 1.0 ...