Git is an open-source distributed version control system that helps in tracking changes made to files. It allows multiple people to work on a project at the same time without losing track of changes made by others.
git diff is a powerful command used to display the differences between two blobs (binary large objects), or the changes between two commits, branches, or even different repositories.
Here, we are interested in comparing a local repository with a remote repository. The task is to find the differences between the local branch and the remote branch. This can be useful in various scenarios such as determining what changes you’ve made locally since your last push, or seeing what changes others have made that you might need to pull.
Assuming you’ve already cloned a remote repository to your local machine, here’s how you can compare the two:
- Fetch the remote repository: The first step is to update your local git ‘picture’ of the remote repository. You can do this using the
git fetchcommand, followed by the name of the remote repository. If you’re comparing with the repository you originally cloned from, this is typically ‘origin’. Here’s how you do it:bashCopy code
git fetch originThis command fetches all the branches from the remote repository and their commits, but it doesn’t merge any changes into your local branches.
- Compare using git diff: The next step is to use the
git diffcommand to compare your local branch with the relevant branch from the remote repository. The
git diffcommand takes two arguments – the names of the branches you want to compare.To compare your current branch with the same branch on the remote repository, you can use:
git diff origin/<branch-name>
<branch-name> with the name of the branch you’re interested in. If you’re working on ‘master’ or ‘main’, it would look like this:
git diff origin/main
This will show you a list of changes between your current local branch and the remote one. The changes your local branch doesn’t have will be marked with a minus (-), and the changes that only your branch has will be marked with a plus (+).
Note: This assumes that you’re set up to track the relevant remote branch. If not, you may need to use
git branch --set-upstream-to=origin/<branch-name> to set that up.
Also, please be aware that this approach will only work if you’ve fetched the latest state of the remote. It’s a good idea to run
git fetch immediately before
git diff to make sure you’re working with the latest data.
Remember, this only displays the differences and doesn’t merge any changes. If you’d like to update your local branch with the changes in the remote repository, you would typically use