flo/scm_breeze
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix git checkout,diff,reset,rm in deleted directories, if pwd is in git dir

Browse Source
This commit is contained in:
Nathan Broadbent
2013-10-22 23:24:54 -07:00
parent b224f49850
commit 878d81a4bd
3 changed files with 26 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
lib/git/aliases.sh
View File

@@ -26,8 +26,10 @@ 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|merge)
commit|blame|add|log|rebase|merge)
exec_scmb_expand_args "$_git_cmd" "$@";;
checkout|diff|rm|reset)
exec_scmb_expand_args --relative "$_git_cmd" "$@";;
branch)
_scmb_git_branch_shortcuts "${@:2}";;
*)
@@ -89,14 +91,13 @@ if [ "$git_setup_aliases" = "yes" ]; then
__git_alias "$git_checkout_alias" "git" "checkout"
__git_alias "$git_commit_alias" "git" "commit"
__git_alias "$git_commit_verbose_alias" "git" "commit" "--verbose"
__git_alias "$git_reset_alias" "git" "reset"
__git_alias "$git_reset_del_alias" "git" "reset" "--"
__git_alias "$git_reset_alias" "git" "reset" "--"
__git_alias "$git_reset_hard_alias" "git" "reset" "--hard"
__git_alias "$git_rm_alias" "git" "rm"
__git_alias "$git_blame_alias" "git" "blame"
__git_alias "$git_diff_alias" "git" "diff"
__git_alias "$git_diff_alias" "git" "diff" "--"
__git_alias "$git_diff_word_alias" "git" "diff" "--word-diff"
__git_alias "$git_diff_cached_alias" "git" "diff" "--cached"
__git_alias "$git_diff_cached_alias" "git" "diff" "--cached --"
__git_alias "$git_add_patch_alias" "git" "add" "-p"
__git_alias "$git_add_updated_alias" "git" "add" "-u"
__git_alias "$git_difftool_alias" "git" "difftool"