Skip to content

Instantly share code, notes, and snippets.

View zur4ik's full-sized avatar
:electron:
Reactive

Zura Jijavadze zur4ik

:electron:
Reactive
18 followers · 13 following
View GitHub Profile
@TrevorS
TrevorS / git-tree-alias.sh
Created March 27, 2014 14:47
git tree alias.
git config --global alias.tree "log --graph --decorate --pretty=oneline --abbrev-commit"
@ffittschen
ffittschen / gitconfig.md
Last active August 13, 2024 11:39
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:

  1. Open the SourceTree preferences and select the Diff tab
  2. Choose Custom both as Visual Diff Tool and as Merge Tool
  3. Paste the following commands into the textfields:
  • Diff Command: /Applications/IntelliJ\ IDEA.app/Contents/MacOS/idea diff