From 8d2f9a2caf4ea10e596dba3e59afa5d1b953b59d Mon Sep 17 00:00:00 2001
From: Colin Hebert <hebert.colin@gmail.com>
Date: Fri, 30 Mar 2012 15:56:46 +0100
Subject: [PATCH] Fix some git aliases

---
 plugins/git/alias.zsh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/plugins/git/alias.zsh b/plugins/git/alias.zsh
index 95bb0839..76f942c7 100644
--- a/plugins/git/alias.zsh
+++ b/plugins/git/alias.zsh
@@ -86,11 +86,11 @@ alias giu='git add --update'
 compdef _git giu=git-add
 alias gid='git diff --no-ext-diff --cached'
 compdef _git gid=git-diff
-function giD { git diff --no-ext-diff --cached --ignore-all-space "$@" | view - }
+alias giD='git diff --no-ext-diff --cached --ignore-all-space'
 compdef _git giD=git-diff
-alias gir='git reset'
+alias gir='git reset --mixed'
 compdef _git gir=git-reset
-alias giR='git reset --mixed'
+alias giR='git reset --keep'
 compdef _git giR=git-reset
 alias gix='git rm -r --cached'
 compdef _git gix=git-rm
@@ -235,7 +235,7 @@ alias gwS='git status'
 compdef _git gwS=git-status
 alias gwd='git diff --no-ext-diff'
 compdef _git gwd=git-diff
-function gwD { git diff --no-ext-diff --ignore-all-space "$@" | view - }
+alias gwD='git diff --no-ext-diff --ignore-all-space'
 compdef _git gwD=git-diff
 alias gwr='git reset --soft'
 compdef _git gwr=git-reset