Is there a way to see git diff from origin/master using Visual Studio Code?

Question

Using Visual Studio Code (version 1.11.2), I can see a side-by-side graphical diff of my current changes very easily by clicking the Source Control button in the left panel. But once I commit those changes to my local repository, I am unable to find a way to see the same side-by-side diff from origin/master.

In other words, is there a way to the spawn comparison tool of Visual Studio Code (version 1.11.2) to show me what I see when I do git diff origin/master, but in the side-by-side graphical diff too?

Not sure why this simple feature missing in VSCode compared with IntelliJ IDEA — vikramvi, Aug 06 '19 at 10:52

score 121 · Accepted Answer · edited Aug 13 '20 at 08:17

121

You can use an extension for this.

Two good options:

Gitlens: https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens

With this one, you can use the >GitLens: Open Changes with... action to compare with any branch (local or remote).

You also can use Git History: https://marketplace.visualstudio.com/items?itemName=donjayamanne.githistory

You can see the entire file history and compare with the current version with the >Git: View File History action.

edited Aug 13 '20 at 08:17

Georgii Ivankin

2,702
2
23
35

answered Jun 23 '17 at 01:03

Luís Henrique Faria

1,560
1
11
14

7

The Gitlens "Compare Line Revision With Previous" context menu option is genius! – Matt Davis Feb 17 '18 at 00:04
3

Note that this has changed as of gitlens release 9.0.0 https://github.com/eamodio/vscode-gitlens/releases/tag/v9.0.0 – fkupper Dec 21 '18 at 09:18
In the new version, use the "Open Changes with Revision..." in the menu option of the tab. – Louis Yang Dec 04 '19 at 01:30
1

Hm, GitLens opens a read-only diff. Is there a way to sync individual changes into HEAD? – bluenote10 Apr 02 '20 at 15:19
It seems to only compare the parent project. Is it possible to be able to select a submodule to compare somehow? – openCivilisation Apr 13 '22 at 21:46
The current version of Gitlens doesn't have a command called `Open Changes with...` – Peter Hall Jul 19 '23 at 09:05

score 29 · Answer 2 · edited Jan 22 '20 at 01:17

29

From Using Version Control in Visual Studio Code:

Add this to the Git configuration file, like ~/.gitconfig:

[diff]
    tool = vscode
[difftool "vscode"]
    cmd = code --wait --diff $LOCAL $REMOTE

When using git difftool HEAD HEAD^, Git will ask if to use Visual Studio Code.

edited Jan 22 '20 at 01:17

Peter Mortensen

30,738
21
105
131

answered Nov 30 '17 at 08:54

bilabila

973
1
12
18

Thanks! Do you know if there is also support for merge? – jurl May 01 '18 at 18:28
This is what I am looking for but the change did nothing for me on Version 2.18.0 – HackSlash Jun 28 '18 at 16:51
@HackSlash I am on git 2.18.0 too, may be you can see the original doc [Using Version Control in VS Code](https://code.visualstudio.com/docs/editor/versioncontrol#_vs-code-as-git-diff-tool) – bilabila Jun 30 '18 at 03:52
1

This command does make vscode my default editor. That's cool. Thanks. `git config --global core.editor "code --wait"` – HackSlash Jul 02 '18 at 15:12

barshopen · Answer 3 · 2023-02-19T02:16:56.293

The accepted answer is good if you want to compare a single file from HEAD to some commit. On the other hand, if you need to diff all your files with another branch, Git Lens also provide solution for that: Go to source control tab on the side(1) > click on BRANCHES(2) > right click on the desired branch (like dev - 3)

Now, a menu will open, choose compare with HEAD

You could also do the same with commits, if in phase (2) you'll choose COMMITS instead.
You could also use cmnd+shift+p or ctrl+shift+p and type GitLens: Compare HEAD with, and then choose the specific wanted commit/branch.

score 9 · Answer 4 · answered Feb 26 '20 at 10:37

9

I use GitLens extension as well. Go to Source Control tab, right click on file you want to compare with origin/master (or other) branch. From the menu choose Open Changes with... and pick a branch.

answered Feb 26 '20 at 10:37

mimo

6,221
7
42
50

serhii kuzmych · Answer 5 · 2022-09-08T14:35:25.903

I am using vscode with GitLens
The most convenient way to see diff from origin/$branch is to use git merge tool.
For example if I want to compare local and remote develop branch I will use the following command

git merge --no-commit --no-ff origin/develop

And the most exiting thing is that I can see all the changes in all the files from the gitlents extension tab and side by side and in case I don't want to merge there is a command

git merge --abort

Hope it helps someone!

score 0 · Answer 6 · answered Feb 16 '23 at 18:26

In case the you are not in synch with the master branch, and your changes are commited to current branch, do git merge master, note the changes, then remove them with git reset.

Otherwise, if you have already merged the latest changes from master to your current branch, you might want to just use the File history section of the Source Control side panel. The icon highlighted in yellow in the image below opens a side-to-side file compare.

PS: The Git Lens "Open changes with..." is a nice solution, but this is a paid extension, which stops working after trial period.

score -4 · Answer 7 · edited Feb 24 '18 at 01:30

-4

From MSDN blog

Viewing Diffs

Our Git tooling supports viewing of Diffs within VS Code. Click the file in the Git view to display a side-by-side view. This allows you to compare your current file with a previous version of it:

edited Feb 24 '18 at 01:30

Stephen Rauch

47,830
31
106
135

answered Feb 24 '18 at 01:11

Rahul

1
1

score -7 · Answer 8 · edited Jan 22 '20 at 01:13

-7

It doesn't use Visual Studio Code, but if you just want to see a quick summary of changes... just start a PR from the branch on GitHub.

edited Jan 22 '20 at 01:13

Peter Mortensen

30,738
21
105
131

answered Nov 29 '17 at 21:37

Johnny5

463
2
5
16

This doesn't work if you want to see diff between staged/uncommitted changes etc, also you have to push each commit just to see the diff – Steel Brain Mar 28 '18 at 22:48

Is there a way to see git diff from origin/master using Visual Studio Code?

8 Answers8

Linked