From 9187f1b04c86d128b72eb28033eee40939bd8427 Mon Sep 17 00:00:00 2001
From: Arthas Park <arthas@rtzr.ai>
Date: Sun, 6 Sep 2020 01:49:39 +0900
Subject: [PATCH] Add aliases for git switch (gsw) / git restore (grt)

---
 git.scmbrc.example | 2 ++
 lib/git/aliases.sh | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/git.scmbrc.example b/git.scmbrc.example
index 6e8e00d..bd32ef2 100644
--- a/git.scmbrc.example
+++ b/git.scmbrc.example
@@ -105,6 +105,8 @@ git_submodule_update_rec_alias="gsur"
 git_top_level_alias="gtop"
 git_whatchanged_alias="gwc"
 git_apply_alias="gapp"
+git_switch_alias="gsw"
+git_restore_alias="grt"
 # Hub aliases (https://github.com/github/hub)
 git_pull_request_alias="gpr"
 
diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
index b8184c3..4308337 100644
--- a/lib/git/aliases.sh
+++ b/lib/git/aliases.sh
@@ -28,9 +28,9 @@ if type hub > /dev/null 2>&1; then export _git_cmd="hub"; fi
 function git(){
   # Only expand args for git commands that deal with paths or branches
   case $1 in
-    commit|blame|add|log|rebase|merge|difftool)
+    commit|blame|add|log|rebase|merge|difftool|switch)
       exec_scmb_expand_args "$_git_cmd" "$@";;
-    checkout|diff|rm|reset)
+    checkout|diff|rm|reset|restore)
       exec_scmb_expand_args --relative "$_git_cmd" "$@";;
     branch)
       _scmb_git_branch_shortcuts "${@:2}";;
@@ -114,6 +114,7 @@ if [ "$git_setup_aliases" = "yes" ]; then
   __git_alias "$git_add_updated_alias"              'git' 'add' '-u'
   __git_alias "$git_difftool_alias"                 'git' 'difftool'
   __git_alias "$git_mergetool_alias"                'git' 'mergetool'
+  __git_alias "$git_restore_alias"                  'git' 'restore'
 
   # Custom default format for git log
   git_log_command="log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit"
@@ -156,6 +157,7 @@ if [ "$git_setup_aliases" = "yes" ]; then
   __git_alias "$git_submodule_update_rec_alias"     'git' 'submodule' 'update' '--init' '--recursive'
   __git_alias "$git_whatchanged_alias"              'git' 'whatchanged'
   __git_alias "$git_apply_alias"                    'git' 'apply'
+  __git_alias "$git_switch_alias"                   'git' 'switch'
 
   # Compound/complex commands
   _alias "$git_fetch_all_alias"           'git fetch --all'