From 83262be0c5576c4ad8e55de9f3598c66ad426765 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E6=9D=BE=E6=B5=A6=20=E7=9F=A5=E4=B9=9F=20Matsuura=20Tomoy?=
 =?UTF-8?q?a?= <me@matsuuratomoya.com>
Date: Mon, 15 Apr 2024 14:28:32 +0900
Subject: [PATCH] [obsidian] vault backup: 2024-04-15 14:28:32[

---
 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 bc32d31f..27197ef9 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": "merge",
+  "syncMethod": "rebase",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
   "treeStructure": false,
@@ -28,7 +28,7 @@
   "gitDir": "",
   "showFileMenu": true,
   "lineAuthor": {
-    "show": false,
+    "show": true,
     "followMovement": "inactive",
     "authorDisplay": "initials",
     "showCommitHash": false,
@@ -47,7 +47,7 @@
       "b": 255
     },
     "textColorCss": "var(--text-muted)",
-    "ignoreWhitespace": false,
+    "ignoreWhitespace": true,
     "gutterSpacingFallbackLength": 5,
     "lastShownAuthorDisplay": "initials",
     "lastShownDateTimeFormatOptions": "date"