Merge branch 'master' of ssh://github.com/meineerde/dotfiles

.bashrc

@@ -67,7 +67,7 @@ fi
 USER_NAME="Holger Just"
 USER_EMAIL="web@meine-er.de"
 # Setting up git.
-if [ -f ~/.gitconfig ]; then
+if [[ -f ~/.gitconfig ]]; then
   if [ "$(git config --global user.name)" != "$USER_NAME" ]; then
     echo "WARNING: git's user.name is $(git config --global user.name)"
   fi

.gitconfig

@@ -1,25 +1,25 @@
 [alias]
-   lg = log --graph --pretty=format:'%Cred%h%Creset %Cblue(%aN)%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
-   chp = cherry-pick
-   st = status
-   co = checkout
-   merge = merge --no-ff
-   pull = pull --no-ff
-   ci = commit
-   cm = commit
+  lg = log --graph --pretty=format:'%Cred%h%Creset %Cblue(%aN)%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr)%Creset' --abbrev-commit --date=relative
+  chp = cherry-pick
+  st = status
+  co = checkout
+  merge = merge --no-ff
+  pull = pull --no-ff
+  ci = commit
+  cm = commit
 [user]
-   name = Holger Just
-   email = "web@meine-er.de"
+  name = Holger Just
+  email = "web@meine-er.de"
 [color]
-   branch = auto
-   diff = auto
-   grep = auto
-   interactive = auto
-   ui = auto
+  branch = auto
+  diff = auto
+  grep = auto
+  interactive = auto
+  ui = auto
 [help]
-   autocorrect = 1
+  autocorrect = 1
 [push]
-   default = matching
+  default = matching
 [core]
-   autocrlf = false
-   editor = mate -wl1
+  autocrlf = false
+  editor = mate -wl1

.irbrc

@@ -0,0 +1,5 @@
+# Rails will log to irb
+require 'logger'
+if ENV.include?('RAILS_ENV') && !Object.const_defined?('RAILS_DEFAULT_LOGGER')
+  Object.const_set('RAILS_DEFAULT_LOGGER', Logger.new(STDOUT))
+end