Git Articles

You want to remove a specific commit from the history. You can do this with git rebase -i.

Let's see how to change the order of commits in Git and rewrite commit history

You worked on a branch and are ready to merge it into main. But main has changed since you started working on your branch. You need to rebase your branch on top of main.

You have merged a branch to your current branch and a few commits later you realize that you want to revert that merge. How do you do it?

You have been working on a feature branch for a while, and you want to see the differences between that branch and the main branch. How do you do that?

Sometimes you need to rewrite a comment of a specific commit. This is how you do it.

In a previous commit, you deleted a file that you now need back. How do you restore it?

You made some changes to a file, but you want to revert that file to a specific commit. This is the only file you want to revert. You don't want to revert the entire repository.

You are sharing a branch with another developer and this developer did a git push --force and you want to resume work on that branch without losing your local commits.

You have been working for a while on a feature branch, but before merging it to main you want to squash all commits into a single one. How do you do that?

One of the most common problems when working with git is how to handle configuration files that are modified locally. This post shows how to handle this situation.

Let's see how we can delete a branch both locally and remotely.

It is usually not recommended to use git --force on a shared branch. Let's see how git push --force-with-lease can help.

It is important to understand how Git manages refs in order to understand how some of the Git commands operate.

The git amend is usually used to change the last commit message, but it can also be used to change the content of the last commit itself.

Let's review the different use cases of the git restore command

This article describes how gits manages the index, aka staging area, aka cache.

You added a file to Git, but now you want to stop tracking it. You don't want to delete it, you just want to stop tracking it. How do you do that?

You just ran git push, sending your changes to your remote server, now you realize there’s a problem with one of those commits. You’d like to undo that commit.

How to remove a file from the staging area?

You want to retrieve a file from another branch, but you don't want to merge the whole branch into your current branch.

Git diff is a very useful command to show the difference between different states of the repository. In this article, we will explore the different options of the git diff command.

You accidentally committed the wrong files to Git, but didn't push the commit to the server yet. How to remove those commits from the local repository?

You made a series of commits on the master branch, which in hindsight you should have been made in another branch. How to move those commits to another branch?