Merge branch 'master' of github.com:vsviridov/dotfiles

gitconfig

@@ -1,21 +1,9 @@
 [user]
-    name = Vasili Sviridov
-    email = vasili@sviridov.ca
+	name = Vasili Sviridov
+	email = vasili@sviridov.ca
 
 [push]
-    default = simple
-[difftool "bcompare-mac"]
-    cmd = "\"/Applications/Beyond Compare 2.app/Contents/MacOS/bcompare"\"
-[mergetool "bcompare-mac"]
-    cmd = "\"/Applications/Beyond Compare 2.app/Contents/MacOS/bcompare\" \"$LOCAL\" \"$REMOTE\" \"$BASE\" \"$MERGED\""
-    trustExitCode = true
-
-[difftool "sourcetree"]
-	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
-    # path =
-[mergetool "sourcetree"]
-	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
-	trustExitCode = true
+	default = simple
 
 [core]
 	editor = /usr/bin/vim

setup.sh

@@ -1,17 +1,18 @@
-#!/bin/sh
+#!/bin/bash
 
 # From aaronjensen/dotfiles
 
-cd `dirname $0`
-F=`pwd |sed -e "s#$HOME/\?##"`
+cd "$(dirname "$0")"
+F=$( pwd |sed -e "s#$HOME/\?##" )
 
 for P in *
 do
   # skip setup
   if [ "$P" = "setup.sh" ]; then continue; fi
+  if [ "$P" = "README.md" ]; then continue; fi
 
   # ensure permissions
-  chmod -R o-rwx,g-rwx $P
+  chmod -R o-rwx,g-rwx "$P"
 
   # skip existing links
   if [ -h "$HOME/.$P" ]; then continue; fi