From c1d555393aa0ee8f6e1da66b9dd2b98510029c9f Mon Sep 17 00:00:00 2001
From: "xiongdian.me" <xiongdian.me@bytedance.com>
Date: Thu, 7 Dec 2023 18:14:42 +0800
Subject: [PATCH] gitconf: pull.ff = only

---
 .gitconfig2 | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.gitconfig2 b/.gitconfig2
index 09a899e..c731d12 100644
--- a/.gitconfig2
+++ b/.gitconfig2
@@ -9,6 +9,8 @@
     quotepath = false  # chinese chars
 [push]
     autoSetupRemote = true
+[pull]
+    ff = only
 [branch]
     # Show most recently changed branches first.
     sort = -committerdate