From: Andres Freund <andres@anarazel.de>
Date: Fri, 26 Sep 2014 11:32:42 +0000 (+0200)
Subject: bdr: Adapt gitignore to the new out-of-tree situation
X-Git-Tag: bdr-plugin/dynconf-before-global-add~124
X-Git-Url: http://git.postgresql.org/gitweb/static/gitweb.js?a=commitdiff_plain;h=7c9f6d3dc173a547cb4a4f0670daeb7ed6c969c1;p=2ndquadrant_bdr.git

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

diff --git a/.gitignore b/.gitignore
index c45857d686..fb7bf3cd69 100644
--- 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