Merge branch 'master' of github.com:tomru/Dotfiles

gitconfig

@@ -8,3 +8,18 @@
 	status = auto
 [core]
 	autocrlf = input
+[alias]
+    st = status
+    co = checkout
+	cm = commit
+    br = branch
+    llog = log --date=local
+    changes = diff --name-status -r
+    diffstat = diff --stat -r
+    lg = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+[merge]
+    tool = bc3
+[mergetool]
+    cmd = /usr/bin/bcompare $LOCAL $REMOTE $BASE $MERGED
+[push]
+	default = current

zsh_nocorrect

@@ -1 +1,4 @@
 git
+npm
+apt-get
+apt-cache

zshrc

@@ -30,9 +30,14 @@ source $ZSH/oh-my-zsh.sh
 
 # Customize to your needs...
 
-# use $HOME/local as default prefix for npm global installs
+# set PATH so it includes user's private bin if it exists
-HOME_LOCAL=$HOME/local
+if [ -d "$HOME/bin" ] ; then
-
+    PATH="$HOME/bin:$PATH"
-if [ -d "$HOME_LOCAL/bin" ] ; then
+fi
-    PATH="$HOME_LOCAL/bin:$PATH"
+
+# local node install
+NODE_PATH="$HOME/local"
+if [ -d $NODE_PATH ] ; then
+    PATH="$NODE_PATH/bin:$PATH"
+    export NODE_PATH
 fi