From 38f0d2f34e84ec3d02c589573a8e097d1807e762 Mon Sep 17 00:00:00 2001
From: Kaleb Elwert <belak@coded.io>
Date: Sat, 15 Apr 2017 14:06:05 -0700
Subject: [PATCH] Rework diff function

This removes --unified from the default options to make it possible to pass -y
without worrying about conflicting output formats.

diffu has also been added as an alias to make it easier to get output as a
unified diff.

Fixes #1231
---
 modules/utility/functions/diff | 8 +++-----
 modules/utility/init.zsh       | 1 +
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/modules/utility/functions/diff b/modules/utility/functions/diff
index d5dd360b..51806e81 100644
--- a/modules/utility/functions/diff
+++ b/modules/utility/functions/diff
@@ -8,14 +8,12 @@
 function diff {
   if zstyle -t ':prezto:module:utility:diff' color; then
     if (( $+commands[colordiff] )); then
-      command colordiff --unified "$@"
-    elif (( $+commands[git] )); then
-      git --no-pager diff --color=auto --no-ext-diff --no-index "$@"
+      command colordiff "$@"
     else
-      command diff --unified "$@"
+      command diff "$@"
     fi
   else
-    command diff --unified "$@"
+    command diff "$@"
   fi
 }
 
diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index 961d917d..34ff578d 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -49,6 +49,7 @@ alias sftp='noglob sftp'
 alias _='sudo'
 alias b='${(z)BROWSER}'
 alias cp="${aliases[cp]:-cp} -i"
+alias diffu="diff --unified"
 alias e='${(z)VISUAL:-${(z)EDITOR}}'
 alias ln="${aliases[ln]:-ln} -i"
 alias mkdir="${aliases[mkdir]:-mkdir} -p"