Merge https://github.com/github/gitignore

Conflicts: Global/VisualStudio.gitignore
2010-11-23 07:42:06 -07:00
parent 2f8c09da0f 9abdee41a6
commit a7def41693
16 changed files with 97 additions and 7 deletions
--- a/Global/CVS.gitignore
+++ b/Global/CVS.gitignore
@@ -0,0 +1,4 @@
+/CVS/*
+*/CVS/*
+.cvsignore
+*/.cvsignore
--- a/Global/Emacs.gitignore
+++ b/Global/Emacs.gitignore
@@ -2,3 +2,6 @@
 \#*\#
 /.emacs.desktop
 /.emacs.desktop.lock
+.elc
+auto-save-list
+tramp
--- a/Global/SVN.gitignore
+++ b/Global/SVN.gitignore
@@ -0,0 +1,2 @@
+/.svn/*
+*/.svn/*
--- a/Global/Tags.gitignore
+++ b/Global/Tags.gitignore
@@ -0,0 +1,3 @@
+# Ignore tags created by etags and ctags
+TAGS
+tags
--- a/Global/TextMate.gitignore
+++ b/Global/TextMate.gitignore
@@ -1,2 +1,3 @@
 *.tmproj
+*.tmproject
 tmtags
--- a/Global/VisualStudio.gitignore
+++ b/Global/VisualStudio.gitignore
@@ -8,14 +8,11 @@
 # Build results
 [Dd]ebug/
 [Rr]elease/
-*.ncb
-*.aps
-*.obj
-.builds
 *_i.c
 *_p.c
 *.ilk
 *.meta
+*.obj
 *.pch
 *.pdb
 *.pgc
@@ -27,6 +24,18 @@
 *.tlh
 *.tmp
 *.vspscc
+.builds
+
+# Visual C++ cache files
+ipch/
+*.aps
+*.ncb
+*.opensdf
+*.sdf
+
+# Visual Studio profiler
+*.psess
+*.vsp

 # ReSharper is a .NET coding add-in
 _ReSharper*