Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973 (#6381)

* Merge from vscode 8e0f348413f4f616c23a88ae30030efa85811973

* disable strict null check

extensions/git/package.json

@@ -3,6 +3,7 @@
   "displayName": "%displayName%",
   "description": "%description%",
   "publisher": "vscode",
+  "license": "MIT",
   "version": "1.0.0",
   "engines": {
     "vscode": "^1.5.0"
@@ -20,7 +21,8 @@
   "scripts": {
     "compile": "gulp compile-extension:git",
     "watch": "gulp watch-extension:git",
-    "update-grammar": "node ./build/update-grammars.js"
+    "update-grammar": "node ./build/update-grammars.js",
+    "test": "mocha"
   },
   "contributes": {
     "commands": [
@@ -80,8 +82,8 @@
         "title": "%command.openFile%",
         "category": "Git",
         "icon": {
-          "light": "resources/icons/light/open-file-mono.svg",
-          "dark": "resources/icons/dark/open-file-mono.svg"
+          "light": "resources/icons/light/open-file.svg",
+          "dark": "resources/icons/dark/open-file.svg"
         }
       },
       {
@@ -317,12 +319,12 @@
       },
       {
         "command": "git.pushWithTags",
-        "title": "%command.pushWithTags%",
+        "title": "%command.pushFollowTags%",
         "category": "Git"
       },
       {
         "command": "git.pushWithTagsForce",
-        "title": "%command.pushWithTagsForce%",
+        "title": "%command.pushFollowTagsForce%",
         "category": "Git"
       },
       {
@@ -1458,13 +1460,14 @@
     "jschardet": "^1.6.0",
     "vscode-extension-telemetry": "0.1.1",
     "vscode-nls": "^4.0.0",
+    "vscode-uri": "^2.0.0",
     "which": "^1.3.0"
   },
   "devDependencies": {
     "@types/byline": "4.2.31",
     "@types/file-type": "^5.2.1",
     "@types/mocha": "2.2.43",
-    "@types/node": "^10.12.21",
+    "@types/node": "^10.14.8",
     "@types/which": "^1.0.28",
     "mocha": "^3.2.0"
   }