.gitconfig: Use diff.algorithm = patience
[dotfiles.git] / .bash_profile
index fbd7e74244d012002234c6b8133ffe23bfbb8462..1122b044fafcea72179f4ffbd15080410a078b06 100644 (file)
@@ -5,9 +5,15 @@ if [ -f ~/.bashrc ]; then
   source ~/.bashrc
 fi
 
+# Set mintty color-palette
+if [ "$UNAME" = "Cygwin" ]; then
+  source ~/.mintty/colors/solarized-ansi.sh
+fi
+
 # keychain
-keychain="$(type -P keychain)"
-test -n "$keychain" && {
+keychain=$(type -P keychain)
+test -n "$keychain" && \
+  test -z "$SUDO_USER" && {
   if [ -f ~/.ssh/id_rsa ]; then
     eval `$keychain -q ~/.ssh/id_rsa`
     source ~/.keychain/`hostname`-sh > /dev/null