Diff to HEAD with PHP Storm

gitnetbeansphpstorm

How can you see a Git diff to HEAD with PHP Storm?

I'm trying to switch over to PHP Storm from NetBeans as I've heard that it's more powerful. But I can't see how to use the Git diff tool, which was really easy to use in NetBeans IDE.

UPDATE – If I right click on an individual file I can go Git / Compare with latest repository version. This will do a diff to head. However if I try and so the same with a parent folder with multiple changed files the option is greyed out.

Best Answer

Select file on Version Control panel and hit ⌘+D to see changes in Difference Viewer.

Also this nice screencasts: 1 and 2 will be so useful for you. First video about IntelliJ but in PhpStorm this features work with the same way

Update:

Related Solutions

Git equivalent to hg update

git checkout <older revision key>

The first little bit of the hash works as a revision key, provided that it only matches that revision.

Windows – Configure Git to use Beyond Compare for image diff

From Using Beyond Compare with Version Control Systems - Git for Windows:

Note: If you use the Git for Windows' Bash Command Prompt instead of the default Windows Command Prompt, you need to escape the $ character with .

For Git 1.7.6 and newer, edit the global config file to set the path

Diff

At a Windows command prompt enter the commands:
git config --global diff.tool bc3
git config --global difftool.bc3.path "c:/program files/beyond compare 3/bcomp.exe"
To launch a diff with BC3, use the command "git difftool foofile.txt".

3-way Merge (v3 Pro)

At a Windows command prompt, enter the commands:
git config --global merge.tool bc3
git config --global mergetool.bc3.path "c:/program files/beyond compare 3/bcomp.exe"
Use git merge for the regular merge and git mergetool for the Beyond Compared based merge.

This worked fine with BCompare-3.3.8.16340.exe and Git-1.8.4-preview20130916.exe:

C:\su-q>git difftool "HEAD^"

Viewing: 'README'
Launch 'bc3' [Y/n]:

Viewing: 'bag_frame.gif'
Launch 'bc3' [Y/n]:

Best Answer

Update:

Related Solutions

Git equivalent to hg update

Windows – Configure Git to use Beyond Compare for image diff

Diff

3-way Merge (v3 Pro)

Related Question