From a33d352cf930c454e4d2487299ff2675839e8540 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 8 Oct 2015 15:28:14 -0700 Subject: [PATCH 1/2] Recognize multiple paths for zsh. --- install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install.sh b/install.sh index f311a36..eeb0759 100755 --- a/install.sh +++ b/install.sh @@ -30,7 +30,7 @@ function prerequisites { return fi if which zsh > /dev/null ; then - if [[ `getent passwd $USER | cut -d: -f7` != `which zsh` ]] ; then + if [[ `getent passwd $USER | cut -d: -f7` != */zsh ]] ; then echo 'Enter password to change shell.' 1>&2 chsh -s `which zsh` fi From 4cd1306393c87c7f5f8d07eaf2c9207abd3d4d47 Mon Sep 17 00:00:00 2001 From: David Tomaschik Date: Thu, 8 Oct 2015 15:35:36 -0700 Subject: [PATCH 2/2] Add more useful git aliases. --- dotfiles/gitconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/dotfiles/gitconfig b/dotfiles/gitconfig index 1eba29e..bd2cc4b 100644 --- a/dotfiles/gitconfig +++ b/dotfiles/gitconfig @@ -20,6 +20,14 @@ [alias] st = status + last = log -1 HEAD + # Thanks to + # http://durdn.com/blog/2012/11/22/must-have-git-aliases-advanced-examples/ + ls = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate + ll = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate --numstat + files = ls-files + f = "!git ls-files | grep -i" + logtree = log --graph --oneline --decorate --all [push] default = current