Merge branch 'master' into hjp

This commit is contained in:
Peter J. Holzer 2018-04-09 12:09:33 +02:00
commit 937862f7d4
2 changed files with 2 additions and 2 deletions

View File

@ -6,7 +6,7 @@
ci = commit ci = commit
st = status st = status
br = branch br = branch
hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short --date-order
type = cat-file -t type = cat-file -t
dump = cat-file -p dump = cat-file -p
[push] [push]

2
.zshrc
View File

@ -44,7 +44,7 @@ pd(){
else else
pushd "$@" pushd "$@"
fi fi
namedir $(echo $(basename "$PWD" | tr -cd 'A-Za-z0-9_') | sed -e 's/^[0-9]/_&/') namedir $(echo $(basename "$PWD" | tr -cd 'A-Za-z0-9_') | tr 'A-Z' 'a-z' | sed -e 's/^[0-9]/_&/')
echo "$PWD" echo "$PWD"
} }