From 2484d11c3dfc92ae0d21ab1dfafdfe48984389d9 Mon Sep 17 00:00:00 2001
From: "Tomoya Matsuura(MacBookPro)" <me@matsuuratomoya.com>
Date: Mon, 15 Apr 2024 22:39:01 +0900
Subject: [PATCH] [obsidian] vault backup: 2024-04-15 22:39:01[

---
 content/.obsidian/plugins/obsidian-git/data.json | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/content/.obsidian/plugins/obsidian-git/data.json b/content/.obsidian/plugins/obsidian-git/data.json
index 27197ef9..bc32d31f 100644
--- a/content/.obsidian/plugins/obsidian-git/data.json
+++ b/content/.obsidian/plugins/obsidian-git/data.json
@@ -12,7 +12,7 @@
   "listChangedFilesInMessageBody": false,
   "showStatusBar": true,
   "updateSubmodules": true,
-  "syncMethod": "rebase",
+  "syncMethod": "merge",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
   "treeStructure": false,
@@ -28,7 +28,7 @@
   "gitDir": "",
   "showFileMenu": true,
   "lineAuthor": {
-    "show": true,
+    "show": false,
     "followMovement": "inactive",
     "authorDisplay": "initials",
     "showCommitHash": false,
@@ -47,7 +47,7 @@
       "b": 255
     },
     "textColorCss": "var(--text-muted)",
-    "ignoreWhitespace": true,
+    "ignoreWhitespace": false,
     "gutterSpacingFallbackLength": 5,
     "lastShownAuthorDisplay": "initials",
     "lastShownDateTimeFormatOptions": "date"