Jonathan M. Lane jmlane
jmlane
/ .gitconfig
Last active
January 27, 2023 08:11
— forked from jvandyke/.gitconfig
Git config for PHP/WebStorm as diff and merge tool on Windows. See http://www.jetbrains.com/webstorm/webhelp/running-webstorm-as-a-diff-or-merge-command-line-tool.html for information on using the diff/merge functionality in the IDE on the command line.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| # ~/.gitconfig | |
| # Add this to your global git configuration file | |
| # Change webstorm to phpstorm, if you use that. | |
| # Diff and merge tool changes | |
| # Run `git difftool <directory/file>...` or `git mergetool <directory/file>...` | |
| [merge] | |
| tool = phpstorm | |
| [diff] | |
| tool = phpstorm |