Permalink
Browse files

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

  • Loading branch information...
2 parents 1774eab + 65d0a39 commit b6aabb2e3fe922c4c567beee805630e68a57eaca @csand committed Jan 10, 2013
Showing with 7 additions and 6 deletions.
  1. +1 −0 .gitignore
  2. +0 −3 git/.gitconfig
  3. +6 −3 zsh/.zshenv
View
@@ -4,3 +4,4 @@ vim/.vim/bundle
vim/.vim/sessions
vim/.vim/.netrwhist
vim/.vim/unmanaged
+vundle/.vim/bundle
View
@@ -33,9 +33,6 @@
branch = auto
interactive = auto
-[push]
- default = simple
-
[difftool "Kaleidoscope"]
cmd = ksdiff --partial-changeset --relative-path \"$MERGED\" -- \"$LOCAL\" \"$REMOTE\"
View
@@ -1,8 +1,11 @@
-
-PATH=$HOME/bin:$PATH
+# Personal bin dir
+PATH=$PATH:$HOME/bin
# Homebrew
-PATH=/usr/local/sbin:$PATH
+if [[ `uname` = 'Darwin' ]]
+then
+ PATH=/usr/local/sbin:$PATH
+fi
# Pythons
if [[ -d /usr/local/share/python ]]

0 comments on commit b6aabb2

Please sign in to comment.