From 2b6e3a9af0be4179eaca734df0eb9eb907ea8966 Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Wed, 18 Jan 2012 15:33:44 +0800 Subject: [PATCH] Revert cf8e3875, added aliases for git reset -- and --hard --- git.scmbrc.example | 2 ++ lib/git/aliases_and_bindings.sh | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/git.scmbrc.example b/git.scmbrc.example index e5b348d..5340169 100644 --- a/git.scmbrc.example +++ b/git.scmbrc.example @@ -36,6 +36,8 @@ exec_git_expand_args_alias="ge" git_checkout_alias="gco" git_commit_alias="gc" git_reset_alias="grs" +git_reset_del_alias="grs-" +git_reset_hard_alias="grsh" git_rm_alias="grm" git_blame_alias="gbl" git_diff_alias="gd" diff --git a/lib/git/aliases_and_bindings.sh b/lib/git/aliases_and_bindings.sh index 9a05f68..f63f601 100644 --- a/lib/git/aliases_and_bindings.sh +++ b/lib/git/aliases_and_bindings.sh @@ -60,7 +60,9 @@ _alias $git_commit_all_alias='git_commit_all' _exp="exec_git_expand_args" __git_alias "$git_checkout_alias" "$_exp git" "checkout" __git_alias "$git_commit_alias" "$_exp git" "commit" -__git_alias "$git_reset_alias" "$_exp git" "reset" "--" +__git_alias "$git_reset_alias" "$_exp git" "reset" +__git_alias "$git_reset_del_alias" "$_exp git" "reset" "--" +__git_alias "$git_reset_hard_alias" "$_exp git" "reset" "--hard" __git_alias "$git_rm_alias" "$_exp git" "rm" __git_alias "$git_blame_alias" "$_exp git" "blame" __git_alias "$git_diff_alias" "$_exp git" "diff"