Merge pull request #2 from eko/add-dockerip

Added "dockerip" alias and fixed Git configuration

.aliases

@@ -34,6 +34,8 @@ alias curltime="curl -w \"\nConnect: %{time_connect} TTFB: %{time_starttransfer}
 alias doc="docker-compose"
 alias doce="docker-compose exec"
 
+alias dockerip="docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}'"
+
 # Golang list imports recursively in a project
 alias golist='go list -f "$(printf '"'"'{{.ImportPath}}:\n{{range .Imports}}  {{.}}\n{{end}}'"'"')" ${1+"$@"}'
 

.gitconfig

@@ -25,9 +25,12 @@
 [alias]
     a = add
     aa = add --all :/
+    authors = shortlog -sn --no-merges
     b = branch -avv
     bd = branch -d
     bm = branch -m
+    brd = !git branch --merged | grep -v master && echo "Type 'git brdf' to delete all these branches"
+    brdf = !git branch --merged | grep -v master | xargs git branch -d
     ci = commit
     cia = commit --amend
     ciaa = commit --all --amend
@@ -51,7 +54,8 @@
     lc = log --oneline --decorate --graph --left-right
     lch = !git log --oneline --decorate --graph --left-right HEAD...$1
     lf = log --oneline --decorate --follow --
-    lg = log --oneline --decorate --graph
+    lga = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset%s %Cgreen(%an %cd)%Creset' --abbrev-commit --date=iso
+    lg = log --graph --pretty=tformat:'%Cred%h%Creset -%C(yellow)%d%Creset%s %Cgreen(%an %cr)%Creset' --abbrev-commit --date=relative
     m = merge
     n = config --local user.name
     r = rebase