mirror of
https://github.com/ckaczor/azuredatastudio.git
synced 2026-02-16 18:46:40 -05:00
Merge from vscode 52dcb723a39ae75bee1bd56b3312d7fcdc87aeed (#6719)
This commit is contained in:
@@ -1148,6 +1148,26 @@
|
||||
"description": "%config.enableSmartCommit%",
|
||||
"default": false
|
||||
},
|
||||
"git.smartCommitChanges": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"all",
|
||||
"tracked"
|
||||
],
|
||||
"enumDescriptions": [
|
||||
"%config.smartCommitChanges.all%",
|
||||
"%config.smartCommitChanges.tracked%"
|
||||
],
|
||||
"scope": "resource",
|
||||
"description": "%config.smartCommitChanges%",
|
||||
"default": "all"
|
||||
},
|
||||
"git.suggestSmartCommit": {
|
||||
"type": "boolean",
|
||||
"scope": "resource",
|
||||
"description": "%config.suggestSmartCommit%",
|
||||
"default": true
|
||||
},
|
||||
"git.enableCommitSigning": {
|
||||
"type": "boolean",
|
||||
"scope": "resource",
|
||||
@@ -1165,10 +1185,26 @@
|
||||
"default": true,
|
||||
"description": "%config.decorations.enabled%"
|
||||
},
|
||||
"git.promptToSaveFilesBeforeCommit": {
|
||||
"git.enableStatusBarSync": {
|
||||
"type": "boolean",
|
||||
"scope": "resource",
|
||||
"default": true,
|
||||
"description": "%config.enableStatusBarSync%",
|
||||
"scope": "resource"
|
||||
},
|
||||
"git.promptToSaveFilesBeforeCommit": {
|
||||
"type": "string",
|
||||
"enum": [
|
||||
"always",
|
||||
"staged",
|
||||
"never"
|
||||
],
|
||||
"enumDescriptions": [
|
||||
"%config.promptToSaveFilesBeforeCommit.always%",
|
||||
"%config.promptToSaveFilesBeforeCommit.staged%",
|
||||
"%config.promptToSaveFilesBeforeCommit.never%"
|
||||
],
|
||||
"scope": "resource",
|
||||
"default": "always",
|
||||
"description": "%config.promptToSaveFilesBeforeCommit%"
|
||||
},
|
||||
"git.postCommitCommand": {
|
||||
@@ -1312,6 +1348,12 @@
|
||||
"scope": "resource",
|
||||
"default": true,
|
||||
"description": "%config.openDiffOnClick%"
|
||||
},
|
||||
"git.supportCancellation": {
|
||||
"type": "boolean",
|
||||
"scope": "resource",
|
||||
"default": false,
|
||||
"description": "%config.supportCancellation%"
|
||||
}
|
||||
}
|
||||
},
|
||||
@@ -1477,4 +1519,4 @@
|
||||
"@types/which": "^1.0.28",
|
||||
"mocha": "^3.2.0"
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user