1
0
mirror of https://github.com/dcarrillo/prezto.git synced 2024-12-23 00:17:59 +00:00

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.
This commit is contained in:
Sorin Ionescu 2012-04-08 14:56:14 -04:00
parent 9d8187ba6b
commit 9f0336b9d8

View File

@ -53,7 +53,7 @@ alias giA='git add --patch'
alias giu='git add --update' alias giu='git add --update'
alias gid='git diff --no-ext-diff --cached' alias gid='git diff --no-ext-diff --cached'
alias giD='git diff --no-ext-diff --cached --word-diff' 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 giR='git reset --keep'
alias gix='git rm -r --cached' alias gix='git rm -r --cached'
alias giX='git rm -rf --cached' alias giX='git rm -rf --cached'