Zura Jijavadze zur4ik

## gitconfig.md

      
              1 file
            
          
              7 forks
            
          
              7 comments
            
          
              32 stars
            
          
                ffittschen
                / gitconfig.md
            
            
              Last active
              January 3, 2024 08:40
            
              
                Use IntelliJ or WebStorm as git mergetool with SourceTree
              
          
    Use IntelliJ or WebStorm as git mergetool

Configure Sourcetree

The merge tool that ships with JetBrain's IntelliJ IDEA or WebStorm is really awesome and way better than FileMerge. It is quite simple to configure SourceTree to use it as the default mergetool:

Open the SourceTree preferences and select the Diff tab
Choose Custom both as Visual Diff Tool and as Merge Tool
Paste the following commands into the textfields:


Diff Command: /Applications/IntelliJ\ IDEA.app/Contents/MacOS/idea diff


## git-tree-alias.sh
git config --global alias.tree "log --graph --decorate --pretty=oneline --abbrev-commit"