book

Jump Start Git, 2nd Edition

Name: Jump Start Git, 2nd Edition
Author: Shaumik Daityari
ISBN: 9781925836349

by Shaumik Daityari

May 2020

Intermediate to advanced

172 pages

2h 39m

English

SitePoint

Read now

Unlock full access

Jump Start Git, Second Edition
Notice of RightsNotice of LiabilityTrademark NoticeAbout SitePointAbout Shaumik Daityari
Preface
Who Should Read This Book?Conventions UsedCode SamplesTips, Notes, and WarningsHey, You!Ahem, Excuse Me ...Make Sure You Always ...Watch Out!Supplementary Materials
Chapter 1: Introduction
IntroductionVersion ControlVersion Control Doesn’t Replace the Need for a Regular Backup SolutionExamples of Version Control in Daily LifeVersion Control Systems: the OptionsVCS Is Not CVSEnter GitGit’s PhilosophyAdvantages of Distributed Version Control SystemsGit and GitHubConclusionWhat Have You Learned?What’s Next?
Chapter 2: Getting Started with Git
GUI ToolsThe Git WorkflowBaby Steps with Git: First CommandsSet Configuration SettingsCreate a Git ProjectIssuing Git CommandsGit AutocompleteCreate Our First CommitDon’t Edit .gitDemonstration OnlyChecking the StatusBeware of Adding Unwanted FilesMake Your Commit Messages Meaningful!Further Commits with GitDiff Only Shows Changes in Tracked FilesBeware of ShortcutsAlways Review Your ChangesWhy git add Again?Commit HistoryThe .gitignore FileUnintentionally Tracking a File Listed in .gitignoreHiding .gitignore from GitSet up Your .gitignore EarlyRemote RepositoriesGitHub Isn’t the Only OptionGitHub Offers Student PricingConclusionWhat Have You Learned?What’s Next?
Chapter 3: Branching in Git
What Are Branches?Branch ConventionsCreate a BranchWhat Does checkout Do?Delete a BranchDon’t Delete Branches Unless You Have ToBranches and HEADAdvanced Branching: Merging BranchesWatch Out for LoopsConclusionWhat Have You Learned?What’s Next?
Chapter 4: Using Git in a Team
The Source Is the originOptional: Different Protocols While CloningAlternative Credential StorageGit GUI Tools Can Generate Keys for YouContributing to the Remote: Git Push RevisitedYou Can Delete Branches Using git pushKeeping Yourself Updated with the Remote: Git PullPulls Are Fast-forward by DefaultHere Be Conflicts!Dealing with a Rejected Git PushRebase?ConflictsMultiple ConflictsAborting a Merge with ConflictsConclusionWhat Have You Learned?What’s Next?
Chapter 5: Git Workflows
The Centralized WorkflowFeaturesNew Team Member OrientationPros and ConsWho Should Use the Centralized WorkflowThe Feature-branch WorkflowFeaturesNew Team Member OrientationPros and ConsWho Should Use the Feature-branch WorkflowGitflow WorkflowFeaturesNew Team Member OrientationPros and ConsWho Should Use the Gitflow WorkflowForking WorkflowFeaturesNew Team Member OrientationPros and ConsWho Should Use the Forking WorkflowConclusionWhat Have You Learned?What’s Next?
Chapter 6: Correcting Errors While Working with Git
Amending Errors in the Git WorkflowUndo Git AddWhy Can’t I Just Delete the File?Forced RemovalWhat Does checkout Really Do?Undo Git CommitWhat’s with HEAD~1?Undo Git PushUse -f with CautionDebugging ToolsGit BlameGit BisectWhy is git bisect So Fast?Learn More About Each CommitAutomated Bisect with Unit TestsExit Codes in Custom Shell ScriptsBeware of Using Old Test FilesConclusionWhat Have You Learned?What’s Next?
Chapter 7: Unlocking Git’s Full Potential
Advanced Use of logShort VersionBranches and HistoryFilter CommitsYou Must Specify a RangeTrace Changes in a Single FileHow Is Tracing Different from git blame?Track Your PeersSearch in Commit MessagesThe Importance of Meaningful Commit MessagesUsing the grep Terminal CommandTagging in GitRefs and reflogreflog Can Act as Insurancereflog Only Tracks Commits for a Certain Period of TimeChecking for Lost CommitsNot to be Confused with the Unix Commandfsck versus reflogRebaseWorking in a TeamJust for IllustrationSquash Commits TogetherAborting a SquashSquash Modifies the Branch HistoryStash Changesstash Untracked FilesAdvanced Use of addDon’t Commit with the -a OptionCherry PickHow Does cherry-pick Differ from merge or rebase?GitHub CLIConclusionWhat Have You Learned?What’s Next?
Chapter 8: Integrate Git in Your Development Cycle
Git and DevOpsUsing Git HooksIntegrating Travis CI with GitHubGetting Started with Travis CITravis CI Build ResultsAdvanced Configuration SettingsConclusionWhat Have You Learned?What’s Next?

Chapter 9: Git GUI Tools
GitHub DesktopNot Just for GitHubSourcetreeSourcetree versus GitHub DesktopConclusion
Chapter 10: Conclusion
Git’s Meteoric RiseWill Git Continue to be Popular in the Future?Beyond Source Code ManagementThe End

Content preview from Jump Start Git, 2nd Edition

Chapter 3: Branching in Git

In Chapter 1, I talked about my one-time fear of trying out new things in a project. What if I tried something ambitious and it broke everything that was working earlier? This problem is solved by the use of branches in Git.

What Are Branches?

Creating a new branch in a project essentially means creating a new copy of that project. You can experiment with this copy without affecting the original. So if the experiment fails, you can just abandon it and return to the original—the master branch.

But if the experiment is successful, Git makes it easy to incorporate the experimental elements into the master. And if, at a later stage, you change your mind, you can easily revert back to the state of the project before this ...

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

PHP and MySQL for Dynamic Web Sites: Visual QuickPro Guide, Fifth Edition

Publisher Resources

ISBN: 9781098124700Errata Page

Cloud Computing

Data Engineering

Data Science

AI & ML

Programming Languages

Software Architecture

IT/Ops

Security

Design

Business

Soft Skills

Jump Start Git, 2nd Edition

by Shaumik Daityari

Chapter 3: Branching in Git

What Are Branches?

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.