From 178544ddc89622e3eb04557f42793bc1df836a26 Mon Sep 17 00:00:00 2001
From: Sami Samhuri <sami.samhuri@gmail.com>
Date: Tue, 27 Jul 2010 22:41:28 -0700
Subject: [PATCH] [git] push is tracking by default, pull always uses rebase

---
 gitconfig | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/gitconfig b/gitconfig
index 1a642a2..b3c9e6c 100644
--- a/gitconfig
+++ b/gitconfig
@@ -8,4 +8,8 @@
 	d = diff
 	lo = log --oneline
 	a = add
-	c = commit
\ No newline at end of file
+	c = commit
+[push]
+	default = tracking
+[branch]
+	autosetuprebase = always