--- a/.gitconfig
+++ b/.gitconfig
@@ -15,9 +15,17 @@
incoming = "!git remote update -p; git log ..@{u}"
outgoing = log @{u}..
glog = log --graph --pretty=format:'%Cred%h%Creset -%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit --date=relative
+ cleanup = "!git branch --merged | grep -v '\\*\\|master\\|develop' | xargs -n 1 echo git branch -d"
[branch]
autosetuprebase = always
+ autosetupmerge = always
+
+[push]
+ default = simple
+
+[rebase]
+ stat = true
[include]
path = ~/.gitconfig.local