Permalink
Browse files

Restructure gitignore so that binaries and build related Visual Studi…

…o files are only ignored below the src directory. This will avoid ignoring e.g. binaries in the Tools directory, which we do want to commit.

Add nunit-editor.exe previously missing due to this.
  • Loading branch information...
1 parent 6913efa commit 2e96656e1944243053de8d579b44aa48ae939b0c @oskarb oskarb committed Feb 10, 2013
Showing with 43 additions and 35 deletions.
  1. +9 −35 .gitignore
  2. BIN Tools/nunit/nunit-editor.exe
  3. +34 −0 src/.gitignore
View
@@ -1,39 +1,13 @@
-# Ignore file for Visual Studio 2008/2010
+# Top-level .gitignore.
+# Rules that apply mainly for for Visual Studio projects should go in src/.gitignore
+# to avoid applying to e.g. the Tools and lib directories.
-*.obj
-*.exe
-*.pdb
-*.user
-*.aps
-*.pch
-*.vspscc
-*_i.c
-*_p.c
-*.ncb
-*.suo
-*.tlb
-*.tlh
+build
*.bak
-*.cache
-*.ilk
-*.log
-*.lib
-*.sbr
-*.scc
-*.tokens
-[Bb]in
-[Db]ebug*/
-obj/
-[Rr]elease*/
-*resharper*
-_ReSharper*/
-[Tt]est[Rr]esult*
-[Bb]uild[Ll]og.*
-*.[Pp]ublish.xml
-NHibernate.dll
-build/
-AssemblyInfo.cs
-hibernate.cfg.xml
+NHibernate.VisualState.xml
available-test-configurations
current-test-configuration
-NHibernate.VisualState.xml
+
+# This will be copied from the build directory to the lib directory in order
+# to satisfy later build steps. But it should not be committed.
+NHibernate.dll
Binary file not shown.
View
@@ -0,0 +1,34 @@
+# Ignore file for Visual Studio 2008/2010
+
+*.obj
+*.exe
+*.pdb
+*.user
+*.aps
+*.pch
+*.vspscc
+*_i.c
+*_p.c
+*.ncb
+*.suo
+*.tlb
+*.tlh
+*.bak
+*.cache
+*.ilk
+*.log
+*.lib
+*.sbr
+*.scc
+*.tokens
+[Bb]in
+[Db]ebug*/
+obj/
+[Rr]elease*/
+*resharper*
+_ReSharper*/
+[Tt]est[Rr]esult*
+[Bb]uild[Ll]og.*
+*.[Pp]ublish.xml
+AssemblyInfo.cs
+hibernate.cfg.xml

0 comments on commit 2e96656

Please sign in to comment.