summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore14
1 files changed, 11 insertions, 3 deletions
diff --git a/.gitignore b/.gitignore
index 4f9f7550b6..ac9b4146a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,13 @@
+#
+# This file is tracked by git for the wireshark repository, and thus
+# should only contain ignore entries common to all wireshark developers.
+# To ignore files specific to your local repository, for example files
+# generated by your editor, add them to your repository exclude file
+# (.git/info/exclude) or your global ~/.gitignore_global. For details
+# see:
+# https://help.github.com/articles/ignoring-files
+#
+
# Compiled or generated source #
################################
*.dll
@@ -9,6 +19,7 @@
*.pyc
*.so*
*.[oa]
+*.dylib
*grammar.out
*grammar.[ch]
*scanner.c
@@ -189,6 +200,3 @@ packaging/macosx/Wireshark_package.pmdoc/index.xml
packaging/rpm/SPECS/wireshark.spec
packaging/svr4/checkinstall
packaging/svr4/pkginfo
-*.dylib
-*.sublime-project
-*.sublime-workspace