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 diff --git a/install.sh b/install.sh index 78c25e8..488c333 100755 --- a/install.sh +++ b/install.sh @@ -10,7 +10,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