From 9aa7e87113e5274996d7868f7446d7a3953a0861 Mon Sep 17 00:00:00 2001 From: Gea-Suan Lin Date: Wed, 2 Dec 2015 08:50:54 +0800 Subject: [PATCH] Use rebase as default. --- .gitconfig | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.gitconfig b/.gitconfig index dcd20db..40a89c8 100644 --- a/.gitconfig +++ b/.gitconfig @@ -14,6 +14,8 @@ preloadindex = yes [merge] tool = vimdiff +[pull] + rebase = true [push] default = matching #