Merge pull request #106 from tuxinaut/master

Add git merge to the expanded numeric commands
scmbreeze · Aug 27, 2013 · 465bb26 · 465bb26
2 parents 22d0b3c + 6f73502
commit 465bb26
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/lib/git/aliases.sh b/lib/git/aliases.sh
@@ -26,7 +26,7 @@ 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
-    checkout|commit|rm|blame|diff|add|log|rebase|reset)
+    checkout|commit|rm|blame|diff|add|log|rebase|reset|merge)
       exec_scmb_expand_args "$_git_cmd" "$@";;
     branch)
       _scmb_git_branch_shortcuts "${@:2}";;