Check out the chapter on Inspecting Changes with Diffs if you want to better understand how to read the actual diff output.This will show you how the file 'index.html' was changed in the feature/login branch, compared to how it looks in the main branch. Git diff command show changes between the working tree and the index or a tree, changes between the index and a tree, changes between two trees, changes between. You can do this simply by adding the file's path: $ git diff main feature/login index.html To compare differences between two branches in Git, you can use the git diff command followed by the branch names you want to compare. Sometimes, you might want to compare how a certain file differs in two branches. How can I compare a certain file in two different branches?

This produces the same output as separating the branches with a space. You can run git diff the command to compare the changes between two commits.

Tip: you might also see notations where the two branches are separated by '.' (e.g. This helps you find out how exactly the code in both branches is different: $ git diff main feature/login It's also possible to compare two branches to each other. In case you are using the Tower Git GUI, its internal diff viewer comes with inline highlighting, whitespace toggling, the ability to show the complete file - and also the possibility to see diffs for image files! Here's an example: $ git diff -color-words index.html You can use it in many different situations, e.g. Instead of the 'classic' display mode in diffs, where old and new contents are displayed in separate lines, this option shows a more concise view. The git diff command helps you see, compare, and understand changes in your project.

can name an arbitrary remote ref (for example. should be the name of a remote repository as passed to git-fetch 1.

What changes did I already add to the Staging Area?īy adding the -staged (or alternatively: -cached) option, Git will show which local changes you have already added to Staging Area, via 'git add': # Staged changes in a certain file.Ĭan I see the changes in a more concise way?Īnother helpful option is -color-words. More precisely, git pull runs git fetch with the given parameters and then depending on configuration options or command line flags, will call either git rebase or git merge to reconcile diverging branches. To compare the differences between two branches in Git, you can use the git diff command followed by the two branch names. You can simply add the path of a file as an option: $ git diff index.html Often, you'll want to see only the changes in a certain file. $ git diff What changes did I make in a certain file?

Running the plain git diff command without any parameters can be pretty helpful: it will show you all of your local changes since you last committed.