From 9f0336b9d8fd23c81290cef6f4d3367bfecf0ca7 Mon Sep 17 00:00:00 2001
From: Sorin Ionescu <sorin.ionescu@gmail.com>
Date: Sun, 8 Apr 2012 14:56:14 -0400
Subject: [PATCH] Remove '--mixed' from the 'gir' alias

Fix a bug introduced in d4a5bed.

Though '--mixed' is the default for 'git reset', using it with paths
returns the following warning.

warning: --mixed with paths is deprecated; use 'git reset -- <paths>'
instead.
---
 modules/git/alias.zsh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/git/alias.zsh b/modules/git/alias.zsh
index 1d401c5..86e2cff 100644
--- a/modules/git/alias.zsh
+++ b/modules/git/alias.zsh
@@ -53,7 +53,7 @@ alias giA='git add --patch'
 alias giu='git add --update'
 alias gid='git diff --no-ext-diff --cached'
 alias giD='git diff --no-ext-diff --cached --word-diff'
-alias gir='git reset --mixed'
+alias gir='git reset'
 alias giR='git reset --keep'
 alias gix='git rm -r --cached'
 alias giX='git rm -rf --cached'