From a7ae4f47a8f2c321e31e87e9ee9d2fef63448da6 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 20 Oct 2014 11:08:23 -0700 Subject: [PATCH 1/2] Rename .zsh_local to .zshrc.local. --- zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zshrc b/zshrc index 174ab21..362a536 100644 --- a/zshrc +++ b/zshrc @@ -45,4 +45,4 @@ bindkey '^[[1;5C' forward-word bindkey '^[[1;5D' backward-word # 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 From 1b901faab1ff835016c80d10e22fd3913994246c Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Mon, 20 Oct 2014 13:46:59 -0700 Subject: [PATCH 2/2] Change push.default to a setting that is widely compatible. --- gitconfig | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/gitconfig b/gitconfig index 6ae1881..9e0b1ad 100644 --- a/gitconfig +++ b/gitconfig @@ -2,9 +2,7 @@ name = David Tomaschik email = david@systemoverlord.com [push] - # Simple is not supported on git < 2.0 - #default = simple - default = matching + default = current [core] excludesfile = ~/.gitignore [web]