Merge remote branch 'beef/master'

Conflicts:
	install.sh
	lib/scm_breeze.sh
This commit is contained in:
Nathan Broadbent
2011-10-21 08:38:54 +08:00
5 changed files with 15 additions and 14 deletions

View File

@@ -7,7 +7,7 @@ _alias $git_alias='git'
# SCM Breeze functions
_alias $git_status_shortcuts_alias="git_status_shortcuts"
_alias $git_add_shortcuts_alias="git_add_shorcuts"
_alias $git_add_shortcuts_alias="git_add_shortcuts"
_alias $exec_git_expand_args_alias="exec_git_expand_args"
_alias $git_show_files_alias="git_show_affected_files"
_alias $git_commit_all_alias='git_commit_all'