sansi email for git
alias p=sansi project path
Merge branch 'master' into sansi

* master:
  Update shellvars
  Update gitconfig
ignore emacs.d/ac-comphist.dat
Merge branch 'master' into sansi

* master:
  Update osx.sh
  Update shellvars
Merge branch 'master' into sansi

* master:
  Update zprofile
Merge branch 'master' into sansi

* master:
  do not update yum or apt
Merge branch 'master' into sansi

* master:
  git st has -uno
do not use cached password, use ssh keys
last commit doesn't work
Merge branch 'sansi' of https://github.com/edwardtoday/dotfiles into sansi

* 'sansi' of https://github.com/edwardtoday/dotfiles:
  do not use cached password, use ssh keys
get credential helper back...
Merge branch 'master' into sansi

* master:
  git config for osx
  git p4merge
  fixed osx install
  fix errors in osx
  chmod +x
  merge with macbook version
no java_home at sansi
use cache for sansi
difftool p4diff
gitconfig for osx