diff options
| author | Gerald Combs <gerald@wireshark.org> | 2020-02-20 11:46:52 -0800 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-02-25 12:37:19 +0000 |
| commit | 7e38df24c6b1259598661b3288711f97501efd4e (patch) | |
| tree | 6286bc47eb7406decf7bd0934f24e66ef2a49d2c /.gitignore | |
| parent | cd6134da9086bf66513a8fa842a4aa04e690025f (diff) | |
Remove some entries from .gitignore.
Remove "Wireshark.*", since that makes tools like ag and rg skip
packaging/wix/Wireshark.wxs. Add a note about this.
Remove other no-longer-relevant entries.
Change-Id: Ib3841249aef2018ca2ef0285a5d0ea799c54d310
Reviewed-on: https://code.wireshark.org/review/36145
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 21d44cb01f..04a3e9ecde 100644 --- a/.gitignore +++ b/.gitignore @@ -8,6 +8,9 @@ # https://help.github.com/articles/ignoring-files # +# Note that this affects tools other than git. For example, ripgrep (rg) +# and The Silver Searcher (ag) will obey this file by default. + # Compiled or generated source # ################################ *.dll @@ -126,7 +129,7 @@ wsar_html.zip *.pdb *.nativecodeanalysis.xml *.rc -!image/file_dlg_win32.rc +!file_dlg_win32.rc *.res *.vcxproj* /Copying.txt @@ -143,7 +146,6 @@ _libs_check_ doc/ws.css packaging/nsis/all-manifest.nsh /packaging/portableapps/WiresharkPortable/ -/zlib/ wireshark-win??-libs*/ # Misc # @@ -155,21 +157,16 @@ wireshark-win??-libs*/ *~ .DS_Store cscope.* -dummy.cpp tags TAGS macosx-support-libs -packaging/macosx/COPYING.txt packaging/macosx/Info.plist packaging/macosx/osx-dmg.sh packaging/macosx/PkgInfo -packaging/macosx/Wireshark_package.pmdoc/index.xml packaging/nsis/config.nsh packaging/nsis/qt-dll-manifest.nsh packaging/portableapps/Files/ packaging/portableapps/appinfo.ini -packaging/rpm/SPECS/wireshark.spec vgcore.* -Wireshark.* .pytest_cache/ test/*.log |