Cacher is the code snippet organizer for pro developers

Create Android Studio Command-line Launcher

In Windows

1. Add path to your Windows system path In my case: "C:\Program Files\Android\Android Studio\bin"

Configure Git to use Android Studio as default Diff Tool

1. Add the following lines to your .gitconfig (Windows: %USERPROFILE%\.gitconfig)

[merge]
   tool = studio64
[mergetool "studio64"]
   cmd = studio64.exe merge $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE") $(cd $(dirname "$BASE") && pwd)/$(basename "$BASE") $(cd $(dirname "$MERGED") && pwd)/$(basename "$MERGED")
   trustExitCode = true
   keepbackup = false
[diff]
   tool = studio64
[difftool "studio64"]
   cmd = studio64.exe diff $(cd $(dirname "$LOCAL") && pwd)/$(basename "$LOCAL") $(cd $(dirname "$REMOTE") && pwd)/$(basename "$REMOTE")
   trustExitCode = true
   keepbackup = false

Using in git bash

For example: git mergetool

Sources

https://www.jetbrains.com/idea/help/running-intellij-idea-as-a-diff-or-merge-command-line-tool.html http://brian.pontarelli.com/2013/10/25/using-idea-for-git-merging-and-diffing/