From 0b927216bfc85ad65f9bda56f2c85573cc242332 Mon Sep 17 00:00:00 2001
From: xietao <xietao@dp2003.com>
Date: Thu, 24 Mar 2022 22:42:43 +0800
Subject: [PATCH] =?UTF-8?q?=E6=95=B4=E7=90=86=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

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

diff --git a/comment.txt b/comment.txt
index df11ebbf..fe7e15ba 100644
--- a/comment.txt
+++ b/comment.txt
@@ -1 +1,3 @@
 https://stackoverflow.com/questions/62653114/how-can-i-deal-with-this-git-warning-pulling-without-specifying-how-to-reconci
+
+git pull --ff-only