Merge branch 'master' of https://git.mgrote.net/mg/dotfiles

.bash_aliases

@@ -9,26 +9,28 @@ alias df="df -h"
 alias grep="grep -i --color=auto"
 alias ll="ls -lah"
 alias l="ls"
-alias dig="dig +short "
+alias tf="tail -f"
-alias tf="tail -f "
+alias scs="systemctl status"
-alias scs="systemctl status "
+alias scr="systemctl restart"
-alias scr="systemctl restart "
+alias scw="watch systemctl status"
-alias scw="watch systemctl status "
 alias hostname="hostname -f"
 alias what="whoami && pwd && hostname -f"
+alias untar="tar -xzf"
 # typo
-alias mkae="make "
+alias mkae="make"
-alias amke="make "
+alias amke="make"
-alias maek="make "
+alias maek="make"
-alias sduo="sudo "
+alias sduo="sudo"
-alias sdou="sudo "
+alias sdou="sudo"
-alias sodu="sudo "
+alias sodu="sudo"
+alias susdo="sudo"
 alias sudo-i="sudo -i"
 alias cd..="cd .."
 alias exot="exit"
 alias nao="nano"
 alias naho="nano"
 alias dicker="docker"
+alias ca="cat"
 # docker
 alias dcu="docker-compose up"
 alias dcd="docker-compose down"

.gitconfig

@@ -3,3 +3,12 @@
 	email = michael.grote@posteo.de
 [credential]
     helper = store
+[alias]
+  logs = log --all --graph --pretty=format:'%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+	s = status
+	p = push
+	c = checkout
+	r = rebase
+	rc = rebase --continue
+	remote = remote -v
+	fetchp = fetch --prune