Microsoft/vscode
1
0
Fork 0
mirror of https://github.com/microsoft/vscode.git synced 2026-05-02 22:41:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit 'refs/pull/59849/head' of github.com:Microsoft/vscode into pr/59849

Browse Source
This commit is contained in:
Joao Moreno
2019-01-04 14:34:28 +01:00
parent 51563e00f4 ae2d0cd96f
commit 9b88d30734
3 changed files with 56 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
extensions/git/package.nls.json
View File

@@ -107,6 +107,7 @@
"config.rebaseWhenSync": "Force git to use rebase when running the sync command.",
"config.confirmEmptyCommits": "Always confirm the creation of empty commits.",
"config.fetchOnPull": "Fetch all branches when pulling or just the current one.",
"config.autoStash": "Stash any changes before pulling and restore them after successful pull.",
"config.allowForcePush": "Controls whether force push (with or without lease) is enabled.",
"config.useForcePushWithLease": "Controls whether force pushing uses the safer force-with-lease variant.",
"config.confirmForcePush": "Controls whether to ask for confirmation before force-pushing.",
@@ -118,4 +119,4 @@
"colors.ignored": "Color for ignored resources.",
"colors.conflict": "Color for resources with conflicts.",
"colors.submodule": "Color for submodule resources."
}
}