X-Git-Url: http://lab.mitty.jp/git/?a=blobdiff_plain;f=TipAndDoc%2F.bashrc;h=fd11a789863db307020f940518532081ef151082;hb=ddb1335b75dbcacd9e3bf7bf7cb90510b67f13af;hp=0ac605b67e261b582e2652075cbbc95dea9f3786;hpb=4c27517d9adfabcf9afa743b40c1d0eae81f873a;p=lab.git diff --git a/TipAndDoc/.bashrc b/TipAndDoc/.bashrc index 0ac605b..fd11a78 100644 --- a/TipAndDoc/.bashrc +++ b/TipAndDoc/.bashrc @@ -1,9 +1,3 @@ -# enable programmable completion features (you don't need to enable -# this, if it's already enabled in /etc/bash.bashrc and /etc/profile -# sources /etc/bash.bashrc). -if [ -f /etc/bash_completion ]; then - . /etc/bash_completion -fi umask 022 # create new file with '644' ulimit -c 0 # no dump core @@ -32,16 +26,16 @@ function I { if [ "$1" ]; then history | grep "$@"; else history 30; fi } -if [ -f $BASH_COMPLETION_DIR/git ]; then - export PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w$(__git_ps1)\$ ' +if [ -f /usr/share/git/completion/git-prompt.sh ]; then + source /usr/share/git/completion/git-prompt.sh + export PS1='\u@\h:\w$(__git_ps1)\$ ' else - export PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ ' + export PS1='\u@\h:\w\$ ' fi -function svnst { - svn st $@ | grep "^[^?]" -} - alias vi='vim' alias sudo='sudo -H ' alias rm='rm -v' +alias screen='screen -U -R' +alias mv='mv -i' +alias cp='cp -i'