git difftool can't find files that were edited
I'm using Webstorm 2016.2.1
Trying to get difftool to work for the first time here. The goal is to be able to run 'git difftool' at anytime and it'll show the diffs for any files that have been modified...just like the command-line does but with of course webstorm's diff editor. I assume I should be able to do 'git difftoo' with nothing after it and it'll pick up multiple files that have changed?
I've checkout out the following resources:
https://gist.github.com/jvandyke/4355099
http://brian.pontarelli.com/2013/10/25/using-idea-for-git-merging-and-diffing
I'm getting a weird error saying it can't find .gitignore when performing a git difftool at the command-line within Webstorm Termina.
In my bash_profile I have:
In my global .gitconfig I have:
[diff]
tool = wstorm
[difftool]
prompt = false
[difftool.wstorm]
cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm diff "$LOCAL" "$REMOTE"
[merge]
tool = wstorm
[mergetool.wstorm]
cmd = /Applications/WebStorm.app/Contents/MacOS/webstorm merge "$LOCAL" "$REMOTE" "$BASE" "$MERGED"
Screenshot proving that the path does resolve and the executable is indeed there:
Why am I getting this random error about .gitignore?
here's my git status, so .gitignore was indeed updated but for some reason git difftool can't open it
请先登录再写评论。
I just upgraded to 2016.3.3 just now, same issue. I actually did a git add . and commit locally since the initial post so now CompanyProfile.js is staged. So now when I do a git difftool, nothing happens, I just get another command-line prompt.
I just made a change to a file, ran git difftool and I get this:
It's weird because that is indeed the file I changed, not sure why it says it can't find it.