Sourcetree diff how to#
Sourcetree diff code#

Scenario 1: Compare files at remote branches (both branches should exists in the remote repository) There are two scenarios to compare files:

Sourcetree diff how to#

How to compare files from two different branches? You can use it two compare files or even branches!įrom the console, you can simply use this command : git diff - myfile.cs

Sourcetree diff code#

You can reverse this by reversing the order of the branches in the diff: git diff branch2 branch1įor Visual Studio Code I strongly suggest the extension: It’s assumed that branch1 is the past and branch2 is the future. This checks for differences between the files. I simply do git diff branch1 branch2 path/to/file This way it will diff from the current branch to the referenced branch ( $BRANCH). If you want to make a diff against the current branch you can commit it and use: git diff $BRANCH - path/to/file , basically anything identifiable as a code state to Git.

v2.0.1.master, i.e., referencing a tag.

mybranch.master, explicitly referencing a state other than the current working tree.

The double-dot prefix means “from the current working directory to”. In this example, you are comparing the file from your actual branch to the file in the master branch.

Option 3: If you want to compare your current working directory to some branch:.

Git diff mybranch:myfile.cs mysecondbranch:myfile.cs In this example, you are comparing the file in “mybranch” branch to the file in the “mysecondbranch” branch. Git diff mybranch/myfile.cs mysecondbranch/myfile.cs Git diff branch1name branch2name path/to/file

Option 1: If you want to compare the file from n specific branch to another specific branch:.

There are many ways to compare files from two different branches: How to compare files from two different branches in git? The same arguments can be passed to git difftool if you have one configured. This is optional unless Git will get confused if the argument refers to a commit or a file, but including it is not a bad habit to get into. In all cases, the - separator before the file name indicates the end of command line flags. In other words, this will give a diff of changes in master since it diverged from mybranch (but without new changes since then in mybranch). git diff A.B is equivalent to git diff $(git-merge-base A B) B. This form is to view the changes on the branch containing and up to the second, starting at a common ancestor of both. You may also be interested in mybranch.master (from git diff documentation):

Using the latter syntax, if either side is HEAD it may be omitted (e.g., master. compares master to HEAD). So if the file were in the src directory, you’d say src/myfile.cs instead of myfile.cs. Note you must specify the relative path to the file. Or, equivalently: git diff mybranch.master - myfile.cs Git diff can show you the difference between two commits: git diff mybranch master - myfile.cs

In this short article, we’ll talk about the different ways to compare branches: you can compare commits, actual changes, or even a specific file on two branches.