From bb6b59091948e647dc32f2f4e2ca07c9e049caf8 Mon Sep 17 00:00:00 2001 From: Sorin Ionescu Date: Sat, 12 Jan 2013 11:25:06 -0500 Subject: [PATCH] [Fix #360] Set alias giR to reset the index interactively --- modules/git/README.md | 4 ++-- modules/git/alias.zsh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/modules/git/README.md b/modules/git/README.md index 3d877485..717f42bb 100644 --- a/modules/git/README.md +++ b/modules/git/README.md @@ -98,8 +98,8 @@ Aliases - `giu` adds file contents to the index (updates only known files). - `gid` displays changes between the index and a named commit (diff). - `giD` displays changes between the index and a named commit (word diff). - - `gir` resets current HEAD to the specified state. - - `giR` resets current index to the specified state. + - `gir` resets the current HEAD to the specified state. + - `giR` resets the current index interactively. - `gix` removes files/directories from the index (recursively). - `giX` removes files/directories from the index (recursively and forced). diff --git a/modules/git/alias.zsh b/modules/git/alias.zsh index f152bb85..027db67f 100644 --- a/modules/git/alias.zsh +++ b/modules/git/alias.zsh @@ -86,7 +86,7 @@ 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' -alias giR='git reset --keep' +alias giR='git reset --patch' alias gix='git rm -r --cached' alias giX='git rm -rf --cached'