updated configs

.gitconfig

@@ -54,6 +54,9 @@
 
 	newgh = "!ghnew() { \\git init; \\hub create $@; }; ghnew"
 
+	gone = ! "git fetch -p && git for-each-ref --format '%(refname:short) %(upstream:track)' refs/heads | awk '$2 == \"[gone]\" {print $1}' | xargs -r git branch -D"
+
+
 [push]
 	followTags = true
 
@@ -75,3 +78,9 @@
 	process = git-lfs filter-process
 	required = true
 	clean = git-lfs clean -- %f
+
+[pull]
+	rebase = false
+
+[init]
+	defaultBranch = master

.zshrc

@@ -118,6 +118,17 @@ function local-forward {
   ssh -L "${local_connection}:${remote_connection}" $@
 }
 
+listening() {
+  if [ $# -eq 0 ]; then
+    sudo lsof -iTCP -sTCP:LISTEN -n -P
+  elif [ $# -eq 1 ]; then
+    sudo lsof -iTCP -sTCP:LISTEN -n -P | grep -i --color $1
+  else
+    echo "Usage: listening [pattern]" >&2
+  fi
+}
+
+
 # Options
 #