search

git-up / GitUp

The Git interface you've been missing all your life has finally arrived.
http://gitup.co
GNU General Public License v3.0
11.45k stars 1.24k forks source link

Support Diff/Merge with IntelliJ Community Edition #941

Open yogurtearl opened 1 year ago

yogurtearl commented 1 year ago

IntelliJ Community Edition (OSS) has a built into diff and merge tool that can be invoked via CLI.

Would like to use these as the diff/merge tools within gitup.

https://www.jetbrains.com/help/idea/command-line-differences-viewer.html

https://www.jetbrains.com/help/idea/command-line-merge-tool.html

lucasderraugh commented 1 year ago

Is there a reason the standard git difftool and mergetool configurations aren't enough to configure this? Not trying to be snarky, just an honest question as I'm not sure I understand why those aren't enough.

neominik commented 8 months ago

The standard git difftool as mergetool config is perfectly sufficient, just not a well-known feature, it seems. You can configure your ~/.gitconfig like in this gist and set the tools to 'git tool' in gitup.