# HG changeset patch
# User Meredith Howard <mhoward@roomag.org>
# Date 1423291675 18000
# Node ID 7d0c758c7a4dc3eaa26bd74db6c81e7e9a600f2c
# Parent  e109208ae2df57a8be2f1eeb303da9fbf92f0b3a
default to rebase w/ pull

diff --git a/.gitconfig b/.gitconfig
--- a/.gitconfig
+++ b/.gitconfig
@@ -16,3 +16,5 @@
 	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
 
+[branch]
+	autosetuprebase = always