提交 84f34a6c 编写于 作者: D Daniel Schildt

Merge remote branch 'upstream/master'

* upstream/master:
  added Waf.gitignore
  Don't ignore empty files meant to preserve the file structure of an application within a git repository for later deployment
  Ignore files generated by Etags and Ctags
  Performance Sessions & Reports.
  Visual C++ additions.
  Added ignore patterns for projects generated using seam-gen
  add Coq gitignore
  dont track compiled elisp
  Added a VB.Net gitignore
  Added to Drupal.gitignore
  add "*.tmproject" to ignore list
  Added patterns for LaTeX Beamer
  Add in rules for WP Super Cache, Google XML Sitemaps, and WP-DBManager plugins.
  Add OCaml gitignore
  Add CVS gitignore for anyone who has to code-share with projects using CVS. Save the dinosaurs.
  Add SVN gitignore for anyone who has to code-share with projects using Subversion
  Fix typo in CodeIgniter gitignore
  Added Drupal gitignore.
...@@ -2,4 +2,4 @@ tmp/* ...@@ -2,4 +2,4 @@ tmp/*
config/database.php config/database.php
app/tmp/* app/tmp/*
app/config/database.php app/config/database.php
!empty
\ No newline at end of file
*/config/database.php */config/database.php
*/system/logs/log-*.php */system/logs/log-*.php
*/system/cache/* */system/cache/*
*/systen/cache/!index.html */system/cache/!index.html
*.vo
*.glob
*.v.d
sites/default/files
sites/default/private
sites/default/settings.php
cache/
files/
settings.php
/README.txt
/CHANGELOG.txt
/COPYRIGHT.txt
/INSTALL*.txt
/LICENSE.txt
/MAINTAINERS.txt
/UPGRADE.txt
sites/all/README.txt
sites/all/modules/README.txt
sites/all/themes/README.txt
/CVS/*
*/CVS/*
.cvsignore
*/.cvsignore
\ No newline at end of file
...@@ -2,3 +2,6 @@ ...@@ -2,3 +2,6 @@
\#*\# \#*\#
/.emacs.desktop /.emacs.desktop
/.emacs.desktop.lock /.emacs.desktop.lock
.elc
auto-save-list
tramp
/.svn/*
*/.svn/*
\ No newline at end of file
# Ignore tags created by etags and ctags
TAGS
tags
*.tmproj *.tmproj
*.tmproject
tmtags tmtags
...@@ -8,11 +8,20 @@ ...@@ -8,11 +8,20 @@
# Build results # Build results
Debug/ Debug/
Release/ Release/
*.ncb
*.aps
*.obj *.obj
.builds .builds
# Visual C++ cache files
ipch/
*.aps
*.ncb
*.opensdf
*.sdf
# Visual Studio profiler
*.psess
*.vsp
# ReSharper is a .NET coding add-in # ReSharper is a .NET coding add-in
_ReSharper* _ReSharper*
......
...@@ -14,4 +14,6 @@ ...@@ -14,4 +14,6 @@
*.fdb_latexmk *.fdb_latexmk
*.pdfsync *.pdfsync
*.synctex.gz *.synctex.gz
*.nav
*.snm
*.vrb
*.annot
*.cmo
*.cma
*.cmi
*.a
*.o
*.cmx
*.cmxs
*.cmxa
/bootstrap/data
/bootstrap/tmp
/classes/ # all class files
/dist/ # contains generated war files for deployment
/exploded-archives/ # war content generation during deploy (or explode)
/test-build/ # test compilation (ant target for Seam)
/test-output/ # test results
/test-report/ # test report generation for, e.g., Hudson
/target/ # maven output folder
temp-testng-customsuite.xml # generated when running test cases under Eclipse
# Thanks to @VonC and @kraftan for their helpful answers on a related question
# on StackOverflow.com:
# http://stackoverflow.com/questions/4176687
# /what-is-the-recommended-source-control-ignore-pattern-for-seam-projects
# Build and Object Folders
bin/
obj/
#User Specific Files
*.user
*.suo
#Resource Caches
_ReSharper.*
*.sln.cache
\ No newline at end of file
# for projects that use Waf for building: http://code.google.com/p/waf/
.waf-*
.lock-*
.htaccess .htaccess
wp-config.php wp-config.php
wp-content/backup-db/*
wp-content/cache/*
wp-content/cache/supercache/*
wp-content/upgrade/*
wp-content/advanced-cache.php
wp-content/wp-cache-config.php
wp-content/uploads/ wp-content/uploads/
sitemap.xml
sitemap.xml.gz
\ No newline at end of file
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册