Merge branch 'master' into hjp

2018-04-09 12:09:33 +02:00 · 2018-04-09 12:09:33 +02:00 · 937862f7d4
parent 58208d86e6 d076880470
commit 937862f7d4
2 changed files with 2 additions and 2 deletions
--- a/.gitconfig
+++ b/.gitconfig
@ -6,7 +6,7 @@
 	ci = commit
 	st = status
 	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
 	dump = cat-file -p
 [push]
--- a/.zshrc
+++ b/.zshrc
@ -44,7 +44,7 @@ pd(){
 	else
 		pushd "$@"
 	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"
 }