Alle .gitignore-Dateien in Top-Level-.gitignore gemerget und diese sortiert

diff --git a/.gitignore b/.gitignore
index 941e1c7221c921b5b96c9d5bcc08b4e910c784f2..7ade8b1ccd92d61fb0f86596062c550886bec4c3 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,16 +1,28 @@
-tags
-crm
-/users/datev-export*
-/users/templates-cache/
-/users/session_files/
-/users/pid/
-/users/.cache/
-/users/kivitendo-print*
-users/.openoffice.org2/
-/config/lx_office.conf
+/config/authentication.pl
+/config/console.conf

 /config/kivitendo.conf
 /config/kivitendo.conf

-/doc/online/*/*.html
-pod2html*
+/config/lx-erp-local.conf
+/config/lx_office.conf

 /doc/build/dobudish*
 /doc/build/dobudish*

+/doc/online/*/*.html
+/locale/*/missing
+/locale/*/lost

 /spool/*
 /spool/*

+/templates/demo*
+/users/*_finanzamt.ini
+/users/.cache/
+/users/.fonts.cache*
+/users/.openoffice.org2/
+/users/.recently-used
+/users/.texmf-var
+/users/console_history
+/users/datev-export*
+/users/kivitendo-print*
+/users/pid/
+/users/session_files/
+/users/templates-cache/
+/users/xvfb_display

 /webdav/*
 /webdav/*

+crm
+pod2html*
+tags

diff --git a/config/.gitignore b/config/.gitignore
deleted file mode 100644 (file)
index 401467c..0000000
--- a/config/.gitignore
+++ /dev/null
@@ -1,3 +0,0 @@
-lx-erp-local.conf
-authentication.pl
-console.conf

diff --git a/locale/de/.gitignore b/locale/de/.gitignore
deleted file mode 100644 (file)
index ccdb7e2..0000000
--- a/locale/de/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-missing
-lost

diff --git a/locale/en/.gitignore b/locale/en/.gitignore
deleted file mode 100644 (file)
index ccdb7e2..0000000
--- a/locale/en/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-missing
-lost

diff --git a/templates/.gitignore b/templates/.gitignore
deleted file mode 100644 (file)
index ab6f884..0000000
--- a/templates/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-demo*

diff --git a/users/.gitignore b/users/.gitignore
deleted file mode 100644 (file)
index 141edb5..0000000
--- a/users/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-.recently-used
-.fonts.cache*
-*_finanzamt.ini
-xvfb_display
-console_history
-.texmf-var

diff --git a/users/.openoffice.org2/user/config/.gitignore b/users/.openoffice.org2/user/config/.gitignore
deleted file mode 100644 (file)
index 940afb4..0000000
--- a/users/.openoffice.org2/user/config/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-imagecache

diff --git a/users/.openoffice.org2/user/psprint/.gitignore b/users/.openoffice.org2/user/psprint/.gitignore
deleted file mode 100644 (file)
index babcd73..0000000
--- a/users/.openoffice.org2/user/psprint/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-pspfontcache

diff --git a/users/.openoffice.org2/user/registry/.gitignore b/users/.openoffice.org2/user/registry/.gitignore
deleted file mode 100644 (file)
index 06cf653..0000000
--- a/users/.openoffice.org2/user/registry/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-cache