# HG changeset patch
# User Dirk Olmes <dirk@xanthippe.ping.de>
# Date 1485328851 -3600
# Node ID 87a831b2afc841a783b1fdac52f047a9eae814a6
# Parent  eaffab53cf43077a035e107718c4227f52b149ae# Parent  ebee1c499f190e5585ba9fa20d0d71aec5481b89
Automated merge with https://xanthippe.duckdns.org/hg/zsh-env

diff -r eaffab53cf43 -r 87a831b2afc8 .gitconfig
--- a/.gitconfig	Tue Jan 24 14:16:38 2017 +0100
+++ b/.gitconfig	Wed Jan 25 08:20:51 2017 +0100
@@ -7,6 +7,7 @@
     rpo = remote prune origin    
     st = status
     wipe = !git add -A && git commit -qm 'WIPE SAVEPOINT' && git reset HEAD~1 --hard
+    wt = worktree
 
 [color]
     ui = false
diff -r eaffab53cf43 -r 87a831b2afc8 zshrc-cassiopeia
--- a/zshrc-cassiopeia	Tue Jan 24 14:16:38 2017 +0100
+++ b/zshrc-cassiopeia	Wed Jan 25 08:20:51 2017 +0100
@@ -13,7 +13,7 @@
 export EXENTRA_WORKSPACE=/home/dirk/Eclipse/Workspaces/Exentra/rpi
 export MULE_TEST_OPTS="-Dmule.verbose=false"
 export MULE_TEST_TIMEOUTSECS=9999
-export PATH="$HOME/bin:${PATH}"
+export PATH="$HOME/bin:${HOME}/.nodejs/bin:${PATH}"
 export PGUSER=postgres
 
 #