From 2a29f6ba59a4069ec86a0b2c109e596e91c2e7f2 Mon Sep 17 00:00:00 2001
From: Jeremy Nicklas <jeremywnicklas@gmail.com>
Date: Tue, 21 Mar 2017 06:53:09 -0400
Subject: [PATCH] simplify git diff alias

Fixes https://github.com/Bash-it/bash-it/issues/921
---
 aliases/available/git.aliases.bash | 17 +----------------
 1 file changed, 1 insertion(+), 16 deletions(-)

diff --git a/aliases/available/git.aliases.bash b/aliases/available/git.aliases.bash
index 7e7bc7eb..0c96f8a4 100644
--- a/aliases/available/git.aliases.bash
+++ b/aliases/available/git.aliases.bash
@@ -33,6 +33,7 @@ alias gpom='git push origin master'
 alias gr='git remote'
 alias grv='git remote -v'
 alias gra='git remote add'
+alias gd='git diff'
 alias gdv='git diff -w "$@" | vim -R -'
 alias gc='git commit -v'
 alias gca='git commit -v -a'
@@ -80,19 +81,3 @@ case $OSTYPE in
     alias gtls='git tag -l | sort -V'
     ;;
 esac
-
-if [ -z "$EDITOR" ]; then
-    case $OSTYPE in
-      linux*)
-        alias gd='git diff | vim -R -'
-        ;;
-      darwin*)
-        alias gd='git diff | mate'
-        ;;
-      *)
-        alias gd='git diff'
-        ;;
-    esac
-else
-    alias gd="git diff | $EDITOR"
-fi