bdr: Adapt gitignore to the new out-of-tree situation

diff --git a/.gitignore b/.gitignore
index c45857d68662b1390d1970cd4ec5ab24473b0334..fb7bf3cd6952f40811bc69d8a52c8ca797c54674 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,42 @@
-bdr_init_copy
-bdr_version.h
-bdr_pgbench_check
-log/
-results/
-tmp_check/
+# Global excludes across all subdirectories - copied from postgres
+*.o
+*.so
+*.so.[0-9]
+*.so.[0-9].[0-9]
+*.sl
+*.sl.[0-9]
+*.sl.[0-9].[0-9]
+*.dylib
+*.dll
+*.a
+*.mo
+*.pot
+objfiles.txt
+.deps/
+*.gcno
+*.gcda
+*.gcov
+*.gcov.out
+lcov.info
+coverage/
+*.vcproj
+*.vcxproj
+win32ver.rc
+*.exe
+lib*dll.def
+lib*.pc
+
+# bdr specific
+/bdr_init_copy
+/bdr_version.h
+/bdr_pgbench_check
+/scripts/bdr_initial_load
+/log/
+/results/
+/tmp_check/
 *~
-bdr-*.tar.bz2
-.distgitrev
-.distgittag
+/bdr-*.tar.bz2
+/.distgitrev
+/.distgittag
+
+>>>>>>> 364ba09... bdr: Adapt gitignore to the new out-of-tree situation