From 39e1029d496dfba015ae96fde3edf7e553564c01 Mon Sep 17 00:00:00 2001
From: "Matsuura Tomoya(Windows)" <me@matsuuratomoya.com>
Date: Sat, 21 Jun 2025 23:06:46 +0900
Subject: [PATCH] [obsidian] vault backup: 2025-06-21 23:06:46[

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

diff --git a/content/.obsidian/plugins/obsidian-git/data.json b/content/.obsidian/plugins/obsidian-git/data.json
index 46be44de..c51f9505 100644
--- a/content/.obsidian/plugins/obsidian-git/data.json
+++ b/content/.obsidian/plugins/obsidian-git/data.json
@@ -1,6 +1,5 @@
 {
   "commitMessage": "[obsidian] vault backup: {{date}}",
-  "autoCommitMessage": "[obsidian] vault backup: {{date}}[",
   "commitDateFormat": "YYYY-MM-DD HH:mm:ss",
   "autoSaveInterval": 60,
   "autoPushInterval": 0,
@@ -9,12 +8,11 @@
   "disablePush": false,
   "pullBeforePush": true,
   "disablePopups": false,
-  "showErrorNotices": true,
   "disablePopupsForNoChanges": false,
   "listChangedFilesInMessageBody": false,
   "showStatusBar": true,
   "updateSubmodules": true,
-  "syncMethod": "rebase",
+  "syncMethod": "merge",
   "customMessageOnAutoBackup": false,
   "autoBackupAfterFileChange": false,
   "treeStructure": false,
@@ -31,7 +29,6 @@
   "showFileMenu": true,
   "authorInHistoryView": "hide",
   "dateInHistoryView": false,
-  "diffStyle": "split",
   "lineAuthor": {
     "show": false,
     "followMovement": "inactive",
@@ -56,5 +53,6 @@
     "gutterSpacingFallbackLength": 15,
     "lastShownAuthorDisplay": "initials",
     "lastShownDateTimeFormatOptions": "date"
-  }
+  },
+  "autoCommitMessage": "[obsidian] vault backup: {{date}}["
 }
\ No newline at end of file