added updates from ryx

home/.bashrc

@@ -61,3 +61,6 @@ fi
 
 source ~/.homesick/repos/homeshick/homeshick.sh
 source ~/.homesick/repos/homeshick/completions/homeshick-completion.bash
+
+# added by travis gem
+[ -f /home/stv0g/.travis/travis.sh ] && source /home/stv0g/.travis/travis.sh

home/.gitconfig

@@ -18,10 +18,10 @@
 	ignorecase = false
 
 [merge]
-	tool = vimdiff
+	tool = meld
 
 [diff]
-	tool = vimdiff
+	tool = meld
 
 [rerere]
 	# Store and re-use manual conflict resolution changes.
@@ -40,7 +40,7 @@
 
 [difftool "sourcetree"]
 	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-	path = 
+	path =
 [mergetool "sourcetree"]
 	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
 	trustExitCode = true

home/.gnupg/gpg-agent.conf

@@ -1,4 +1,4 @@
-pinentry-program ${HOME}/.homesick/repos/dotfiles/pinentry.sh
+pinentry-program /home/stv0g/.homesick/repos/dotfiles/pinentry.sh
 write-env-file
 enable-ssh-support
 default-cache-ttl 600

home/.ssh/config

@@ -0,0 +1,12 @@
+Host *.rz.rwth-aachen.de
+	User sv111090
+
+Host zerberus.rwth-aachen.de
+	User vogel
+
+Host acs.0l.dn42
+	User acs-admin
+
+Host *
+	ControlMaster auto
+	ControlPath ~/.ssh/master-%r@%h:%p