Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRobin Rosenberg2014-05-21 09:24:38 +0000
committerGerrit Code Review @ Eclipse.org2014-05-21 09:24:38 +0000
commitbd30970ad64004f19544d7ff0de4175e8e66613c (patch)
tree6f2d47989d8ed62fa1dbcef2993769932d5055ba
parent0ae32941d5efbcf1b5c1aaa71c5cda629efd8258 (diff)
parenta249957c27d8e8e0f0a46ba723932474b5dee40a (diff)
downloadegit-bd30970ad64004f19544d7ff0de4175e8e66613c.tar.gz
egit-bd30970ad64004f19544d7ff0de4175e8e66613c.tar.xz
egit-bd30970ad64004f19544d7ff0de4175e8e66613c.zip
Merge "Register .gitignore as a text contenttype"
-rw-r--r--org.eclipse.egit.ui/plugin.properties2
-rw-r--r--org.eclipse.egit.ui/plugin.xml11
2 files changed, 13 insertions, 0 deletions
diff --git a/org.eclipse.egit.ui/plugin.properties b/org.eclipse.egit.ui/plugin.properties
index 4d27abaaba..3b7f6e03fd 100644
--- a/org.eclipse.egit.ui/plugin.properties
+++ b/org.eclipse.egit.ui/plugin.properties
@@ -388,3 +388,5 @@ PushToGerritMenu.label = Push to Gerrit...
GarbageCollectCommand.label = Collect Garbage
GitInteractiveRebaseView_name = Git Interactive Rebase
+
+GitIgnoreContentTypeName = Gitignore File
diff --git a/org.eclipse.egit.ui/plugin.xml b/org.eclipse.egit.ui/plugin.xml
index 3dfac6c4d3..1042698c18 100644
--- a/org.eclipse.egit.ui/plugin.xml
+++ b/org.eclipse.egit.ui/plugin.xml
@@ -5562,4 +5562,15 @@
</themeid>
</stylesheet>
</extension>
+ <extension point="org.eclipse.core.contenttype.contentTypes">
+ <file-association
+ content-type="org.eclipse.core.runtime.text"
+ file-names=".gitignore"/>
+ <content-type
+ id="org.eclipse.egit.contenttype.gitignore"
+ base-type="org.eclipse.core.runtime.text"
+ file-names=".gitignore"
+ priority="normal"
+ name="%GitIgnoreContentTypeName"/>
+ </extension>
</plugin>

Back to the top