mirror of
https://github.com/Matir/skel.git
synced 2026-05-25 21:19:09 -07:00
Merge branch 'master' of https://github.com/Matir/skel
This commit is contained in:
@@ -20,6 +20,14 @@
|
|||||||
|
|
||||||
[alias]
|
[alias]
|
||||||
st = status
|
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]
|
[push]
|
||||||
default = current
|
default = current
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ function prerequisites {
|
|||||||
return
|
return
|
||||||
fi
|
fi
|
||||||
if which zsh > /dev/null ; then
|
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
|
echo 'Enter password to change shell.' 1>&2
|
||||||
chsh -s `which zsh`
|
chsh -s `which zsh`
|
||||||
fi
|
fi
|
||||||
|
|||||||
Reference in New Issue
Block a user