Create Android Studio Command-line Launcher Open Android Studio Go to: Tools > Create Command-line Launcher Leave as default, Press OK Configure Git to use Android Studio as default Diff Tool Add the following lines to your .gitconfig