From 7b63a27c62cd3de166354ac917046a1acf8ebafc Mon Sep 17 00:00:00 2001
From: linarnan <linarnan@estinet.com>
Date: Mon, 23 Oct 2017 10:47:21 +0800
Subject: [PATCH] Always use pull rebase

---
 .gitconfig | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.gitconfig b/.gitconfig
index 263f035447..09ba1c8785 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -53,6 +53,9 @@
 [merge]
 	tool = opendiff
 
+[branch]
+	autosetuprebase = always
+
 # rewrites of repo paths
 [url "git@github.com:"]
 	insteadOf = "gh:"