From 1ab0e7574657bbf576cc7158beef5b7237186a19 Mon Sep 17 00:00:00 2001 From: Nathan Broadbent Date: Wed, 18 Jan 2012 17:32:38 +0800 Subject: [PATCH] Added aliases for git_rebase_alias_continue and git_rebase_alias_abort --- git.scmbrc.example | 2 ++ lib/git/aliases_and_bindings.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/git.scmbrc.example b/git.scmbrc.example index 5340169..89a29b5 100644 --- a/git.scmbrc.example +++ b/git.scmbrc.example @@ -63,6 +63,8 @@ git_remote_alias="gr" git_branch_alias="gb" git_branch_all_alias="gba" git_rebase_alias="grb" +git_rebase_alias_continue="grbc" +git_rebase_alias_abort="grba" git_merge_alias="gm" git_cherry_pick_alias="gcp" git_log_alias="gl" diff --git a/lib/git/aliases_and_bindings.sh b/lib/git/aliases_and_bindings.sh index f63f601..ff72ae7 100644 --- a/lib/git/aliases_and_bindings.sh +++ b/lib/git/aliases_and_bindings.sh @@ -80,6 +80,8 @@ __git_alias "$git_clean_force_alias" "git" "clean" "-fd" __git_alias "$git_remote_alias" "git" 'remote' '-v' __git_alias "$git_branch_alias" "git" 'branch' __git_alias "$git_rebase_alias" "git" 'rebase' +__git_alias "$git_rebase_alias_continue" "git" 'rebase' "--continue" +__git_alias "$git_rebase_alias_abort" "git" 'rebase' "--abort" __git_alias "$git_merge_alias" "git" 'merge' __git_alias "$git_cherry_pick_alias" "git" 'cherry-pick' __git_alias "$git_log_alias" "git" 'log'