diff options
| author | Hadriel Kaplan <hadrielk@yahoo.com> | 2014-02-22 14:56:25 -0500 |
|---|---|---|
| committer | Evan Huus <eapache@gmail.com> | 2014-02-23 01:07:18 +0000 |
| commit | 41fc5a53e9d645b9a089f57c08679a6d2bf766b5 (patch) | |
| tree | c7d3640fb39d62c48e7ee14b51de597d5c5da98e /.gitignore | |
| parent | ce932fb0b5e824520f85c01cc29df25bac571d39 (diff) | |
| download | wireshark-41fc5a53e9d645b9a089f57c08679a6d2bf766b5.tar.gz | |
Add note to .gitignore on how to ignore locally-specific files
Also, this removes a couple locally-specific files I had previously added.
Change-Id: Ib93e0dc5aeb062321e47f77a084b0581f87046c6
Reviewed-on: https://code.wireshark.org/review/315
Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com>
Reviewed-by: Evan Huus <eapache@gmail.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 14 |
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 |