From f73ae1720d5ca7ad2bf3784a3294b29d4c6c3ee5 Mon Sep 17 00:00:00 2001
From: Hsieh Chin Fan <typebrook@gmail.com>
Date: Tue, 9 Mar 2021 17:33:27 +0800
Subject: update

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

(limited to 'gitconfig')

diff --git a/gitconfig b/gitconfig
index d74ea7d..bdc0121 100644
--- a/gitconfig
+++ b/gitconfig
@@ -18,5 +18,8 @@
 [merge]
     tool = vimdiff
 
+[pull]
+    ff = only
+
 [credential]
     helper = store
-- 
cgit v1.2.3-70-g09d2