book

Learning Git

by Anna Skoulikari

May 2023

Beginner

320 pages

8h 17m

English

O'Reilly Media, Inc.

Read now

Unlock full access

Includes

Has Sandbox

What Is Git?The Graphical User Interface and the Command LineOpening a Command Line WindowExecuting Commands in the Command LineInstalling GitCommand Options and ArgumentsClearing the Command LineOpening the Filesystem WindowWorking with DirectoriesClosing the Command LineSetting Git ConfigurationsPreparing a Text EditorIntegrated TerminalsSummary
Current SetupIntroducing RepositoriesInitializing a Local RepositoryThe Areas of GitAdding a File to a Git ProjectSummary
Current SetupWhy Do We Make Commits? The Two Steps to Make a CommitViewing a List of Commits Summary
State of the Local RepositoryWhy Do We Use Branches?Unmodified and Modified FilesMaking Commits on a BranchCreating a BranchWhat Is HEAD? Switching BranchesWorking on a Separate BranchSummary
State of the Local RepositoryIntroducing MergingTypes of Merges Doing a Fast-Forward Merge Checking Out CommitsCreating a Branch and Switching onto It in One GoSummary
Hosting Services and Remote RepositoriesSetting Up a Hosting Service AccountSetting Up Authentication CredentialsSummary
State of the Local RepositoryThe Two Ways to Start Work on a Git ProjectThe Interaction Between Local and Remote RepositoriesWhy Do We Use Remote Repositories?Creating a Remote Repository with DataWorking on a Remote Repository Directly on a Hosting ServiceSummary
State of the Local and Remote RepositoriesCloning a Remote RepositoryDeleting Branches Git Collaboration and BranchesIncorporating Changes from the Remote RepositoryDeleting Branches (Continued)Summary
State of the Local and Remote RepositoriesWhy Are Three-Way Merges Important?Setting Up a Three-Way Merge ScenarioDefining Upstream Branches Editing the Same File Multiple Times Between CommitsWorking at the Same Time as Others on Different Files Three-Way Merge in PracticePulling Changes from a Remote RepositoryState of the Local and Remote RepositoriesSummary

State of the Local and Remote RepositoriesIntroducing Merge ConflictsHow to Resolve Merge ConflictsSetting Up a Merge Conflict ScenarioThe Merge Conflict Resolution Process Resolving Merge Conflicts in PracticeStaying Up to Date with a Remote RepositorySyncing the Repositories State of the Local and Remote RepositoriesSummary
State of the Local and Remote RepositoriesIntegrating Changes in GitWhy Is Rebasing Helpful?Setting Up the Rebasing Example Unstaging and Staging Files Preparing to RebaseThe Five Stages of the Rebase Process Rebasing and Merge ConflictsRebasing a Branch in Practice The Golden Rule of RebasingSyncing the Repositories State of the Local and Remote RepositoriesSummary
State of the Local and Remote RepositoriesIntroducing Pull RequestsHosting Service SpecificsWhy Use Pull Requests?Understanding How Pull Requests Are MergedPreparing to Make a Pull RequestAn Easier Way to Define Upstream BranchesCreating a Pull Request on a Hosting ServiceReviewing and Approving a Pull RequestMerging a Pull RequestDeleting Remote BranchesSyncing the Local Repositories and Cleaning UpState of the Local and Remote RepositoriesSummary

Content preview from Learning Git

Chapter 6. Hosting Services and Authentication

[ 6 ]

Hosting Services and Authentication

In the last chapter, you learned about merging and how this feature of Git allows you to integrate changes from one branch into another.

Up until this point we have discussed working only in local repositories, and you have worked only on the rainbow repository, which is a local repository. This chapter marks the start of the second part of this book, in which you will work with hosting services and remote repositories.

In this chapter, you will choose a hosting service and prepare the authentication details you will use to connect to remote repositories on that hosting service by using either the HTTPS (Hypertext Transfer Protocol Secure) or SSH (Secure Shell) protocol. The information that you will need to carry out these tasks is contained in this chapter as well as in the resources in the Learning Git repository (https://github.com/gitlearningjourney/learning-git).

[ Note ]

If you work at a company that uses Git and a hosting service, you may already have a hosting service account using your company email address. However, I recommend using a personal account with a hosting service for the exercises in this book instead of a company account. This is because your company may have configured additional settings on the company hosting service account that could complicate exercises later in the book.

If you already work with a hosting service that you want to ...