if [ "$1" ]; then history | grep "$@"; else history 30; fi
}
-if [ -f $BASH_COMPLETION_DIR/git ]; then
+if [ -f $BASH_COMPLETION_DIR/git -o -f $BASH_COMPLETION_COMPAT_DIR/git ]; then
export PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w$(__git_ps1)\$ '
else
export PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
fi
+function svnst {
+ svn st $@ | grep "^[^?]"
+}
+
+function hexcmp {
+ cmp -l "$@" | awk '{printf "%08X %02X %02X\n", $1-1, strtonum(0$2), strtonum(0$3)}'
+}
+
alias vi='vim'
alias sudo='sudo -H '
alias rm='rm -v'
+alias screen='screen -U -R'
+alias mv='mv -i'
+alias cp='cp -i'