Merge branch 'git-merge' of https://github.com/gecharo/vscode into gecharo-git-merge

This commit is contained in:
Joao Moreno
2017-06-26 09:56:42 +02:00
5 changed files with 50 additions and 3 deletions

View File

@@ -22,6 +22,7 @@
"command.checkout": "Checkout to...",
"command.branch": "Create Branch...",
"command.deleteBranch": "Delete Branch...",
"command.merge": "Merge Branch...",
"command.pull": "Pull",
"command.pullRebase": "Pull (Rebase)",
"command.push": "Push",
@@ -42,4 +43,4 @@
"config.ignoreLimitWarning": "Ignores the warning when there are too many changes in a repository",
"config.defaultCloneDirectory": "The default location where to clone a git repository",
"config.enableSmartCommit": "Commit all changes when there are no staged changes."
}
}