[obsidian] vault backup: 2025-06-21 23:06:46[

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}}["
 }