From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 31 Jul 2013 15:36:46 +0000 (+0200)
Subject: .bashrc:
X-Git-Url: https://git.jankratochvil.net/?p=nethome.git;a=commitdiff_plain;h=186b152206b499eb5dd12c8edf5e8fbeffc727d7

.bashrc:
+GIT_MERGE_AUTOEDIT=no
rsync: +c
---

diff --git a/.bashrc b/.bashrc
index a63f2ed..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