Chapter 5

Tagging and branching

In this chapter, we'll learn to reference specific commits in a more human-friendly way. We'll also learn how to create and manage branches, which are a way to keep different lines of development separate.

Chapter contents

Tagging and branching

Referencing commits

Branches and branching strategies

Creating and switching branches

Merging branches

Conclusion and next steps

Let's get started!

Wanna try the Story mode?

Take the course as it was meant to be taken: bite-sized progression, focused linear order, gradually unlock Gitopedia entries. Continue with real Git in VS Code/Cursor at any time.

FREE
but requires sign-in

Intro to version control

What is version control?

Why use version control?

Introduction to Git

Git workflow example

Conclusion and next steps

Command line and terminal

The git command

Configuring Git credentials

Configuring line endings treatment

Configuring default branch name

Conclusion and next steps

Putting the project under version control

Navigating the terminal

Initializing a repository

Creating work files

Recording changes

Checking the status of the repository

Conclusion and next steps

Resetting unwanted changes

Comparing the working tree with the repository

Discarding local changes

Discarding staged changes

Amending the last commit

Conclusion and next steps

Tagging and branching

Referencing commits

Branches and branching strategies

Creating and switching branches

Merging branches

Conclusion and next steps

Browsing history

Checking the difference between commits

Reverting changes made in older commits

Resetting branches

Conclusion and next steps

Remotes and GitHub

What is a remote repository?

Creating a GitHub repository

Adding GitHub repository as a remote

Pushing and pulling changes from the remote repository

The danger of rewriting history on a public repository

Conclusion and next steps