mutt_ldap_query: Fix RH hostname.

[nethome.git] / .bashrc

diff --git a/.bashrc b/.bashrc
index 5f03937..5516f70 100644 (file)
--- a/.bashrc
+++ b/.bashrc
@@ -156,6 +156,8 @@ eval '
        function ucwkbd { setxkbmap -layout us,cz -variant ,ucw -option grp:caps_switch; }
 '
 
+unset command_not_found_handle
+shopt -u progcomp # Disable 'bash-completion' rpm
 export IGNOREEOF=10
 # '2>/dev/null' to prevent: TMOUT: readonly variable
 [ -n "$SSH_TTY" ] && export TMOUT=900 2>/dev/null
@@ -234,6 +236,7 @@ export LC_COLLATE=C
 # http://lists.gnu.org/archive/html/bug-readline/2009-09/msg00006.html
 # 2>/dev/null for possible: stty: standard input: Inappropriate ioctl for device
 stty -echoctl 2>/dev/null
+export GIT_MERGE_AUTOEDIT=no
 
 function wclines { awk '{x[$0]++}END{for (i in x) print x[i]"\t"i}'; }
 # SunOS does not support "-m"
@@ -249,7 +252,7 @@ function finame { find . -false `
        `; }
 function mkcd { mkdir -p "$1"; cd "$1"; }
 function pushdmk { mkdir -p "$1"; pushd "$1"; }
-function rsync {(unset rsync; n rsync -a -v -e ssh --progress --stats --inplace --rsync-path='nice -n20 ionice -c3 rsync' "$@"; );}
+function rsync {(unset rsync; n rsync -c -a -v -e ssh --progress --stats --inplace --rsync-path='nice -n20 ionice -c3 rsync' "$@"; );}
 function tohex { od -An -txC|tr -d '\n '|tr 'a-f' 'A-F';echo; }
 function edall {
        find -type f|while read -r i;do
@@ -378,6 +381,7 @@ function gpg {(unset gpg; http_proxy= all_proxy= HTTP_PROXY= ALL_PROXY= gpg "$@"
 ulimit -S -c 0
 set +H
 shopt -s mailwarn
+shopt -s direxpand
 unset OPTIND
 umask 022