diff --git a/profiles/main/data/settings.json b/profiles/main/data/settings.json index 67873c0..554074c 100644 --- a/profiles/main/data/settings.json +++ b/profiles/main/data/settings.json @@ -74,7 +74,6 @@ "ansible.lightspeed.enabled": false, "git.confirmSync": false, "git.autofetch": true, - "git.enableSmartCommit": true, "basedpyright.analysis.inlayHints.callArgumentNamesMatching": true, "black-formatter.args": [ "--line-length", @@ -147,5 +146,14 @@ "explorer.excludeGitIgnore": true, "git.allowForcePush": true, "git.autoStash": true, - "git.blame.editorDecoration.enabled": true + "git.blame.editorDecoration.enabled": true, + "git.closeDiffOnOperation": true, + "git.fetchOnPull": true, + "git.followTagsWhenSync": true, + "git.mergeEditor": true, + "git.pullBeforeCheckout": true, + "git.rebaseWhenSync": true, + "git.terminalGitEditor": true, + "git.timeline.showUncommitted": true, + "git.untrackedChanges": "separate" } \ No newline at end of file