Merge pull request #106 from tuxinaut/master

Add git merge to the expanded numeric commands
This commit is contained in:
Nathan Broadbent
2013-08-26 17:47:56 -07:00

View File

@@ -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}";;