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

This commit is contained in:
David Tomaschik
2014-10-21 18:41:22 -07:00
2 changed files with 2 additions and 4 deletions

View File

@@ -2,9 +2,7 @@
name = David Tomaschik name = David Tomaschik
email = david@systemoverlord.com email = david@systemoverlord.com
[push] [push]
# Simple is not supported on git < 2.0 default = current
#default = simple
default = matching
[core] [core]
excludesfile = ~/.gitignore excludesfile = ~/.gitignore
[web] [web]

2
zshrc
View File

@@ -45,4 +45,4 @@ bindkey '^[[1;5C' forward-word
bindkey '^[[1;5D' backward-word bindkey '^[[1;5D' backward-word
# Load any local settings # Load any local settings
if [ -e $HOME/.zsh_local ] ; then source $HOME/.zsh_local ; fi if [ -e $HOME/.zshrc.local ] ; then source $HOME/.zshrc.local ; fi