X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=blobdiff_plain;f=.bashrc;h=5516f70101fe7b247213ba20e5de514c2806e14c;hp=a174b8481f709a2affb8afb1969eecbe0f7ee208;hb=b25e82640e468a3f27b66670090a76cecfcabe7c;hpb=b26b3e459df61e5eff2c9818b7e13b7cbdecbefd

diff --git a/.bashrc b/.bashrc
index a174b84..5516f70 100644
--- a/.bashrc
+++ b/.bashrc
@@ -236,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"
@@ -251,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
@@ -380,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