diff --git a/extensions/git/languages/ignore.language-configuration.json b/extensions/git/languages/ignore.language-configuration.json
new file mode 100644
index 00000000000..b75f42e22a8
--- /dev/null
+++ b/extensions/git/languages/ignore.language-configuration.json
@@ -0,0 +1,5 @@
+{
+	"comments": {
+		"lineComment": "#",
+	}
+}
diff --git a/extensions/git/package.json b/extensions/git/package.json
index c2851ea34c2..befcfc88349 100644
--- a/extensions/git/package.json
+++ b/extensions/git/package.json
@@ -1082,6 +1082,17 @@
           ".rej"
         ],
         "configuration": "./languages/diff.language-configuration.json"
+      },
+      {
+        "id": "ignore",
+        "aliases": [
+          "Ignore",
+          "ignore"
+        ],
+        "filenames": [
+          ".gitignore"
+        ],
+        "configuration": "./languages/ignore.language-configuration.json"
       }
     ],
     "grammars": [
@@ -1099,6 +1110,11 @@
         "language": "diff",
         "scopeName": "source.diff",
         "path": "./syntaxes/diff.tmLanguage.json"
+      },
+      {
+        "language": "ignore",
+        "scopeName": "source.ignore",
+        "path": "./syntaxes/ignore.tmLanguage.json"
       }
     ],
     "configurationDefaults": {
diff --git a/extensions/git/syntaxes/ignore.tmLanguage.json b/extensions/git/syntaxes/ignore.tmLanguage.json
new file mode 100644
index 00000000000..7df8865537f
--- /dev/null
+++ b/extensions/git/syntaxes/ignore.tmLanguage.json
@@ -0,0 +1,10 @@
+{
+	"name": "Ignore",
+	"scopeName": "source.ignore",
+	"patterns": [
+		{
+			"match": "^#.*",
+			"name": "comment.line.number-sign.ignore"
+		}
+	]
+}