[Libreoffice-commits] .: Branch 'feature/submodules' - .gitattributes .gitignore

Norbert Thiebaud nthiebaud at kemper.freedesktop.org
Fri Mar 9 11:06:25 PST 2012


 .gitattributes |    2 ++
 .gitignore     |   57 ++++++++++++++++++++++-----------------------------------
 2 files changed, 24 insertions(+), 35 deletions(-)

New commits:
commit 22d181f13854ea5fbb5eb685e50848a9edefdac1
Author: Norbert Thiebaud <nthiebaud at gmail.com>
Date:   Fri Mar 9 13:03:25 2012 -0600

    adjust .gitignore own its own attributes
    
    irgnoring path related files like .orgi .rej and similar files
    should not be done globally for eveyone
    
    If someone what to hide these instead of cleaning-up their house
    they should put it in .git/info/exclude
    or at other user-level customization places.

diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 0000000..416fa8c
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.doc binary
+*.sdw binary
diff --git a/.gitignore b/.gitignore
index 0613205..cd48618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,46 +29,33 @@
 # Backup files:
 *~
 .*sw?
-\#*
 .DS_Store
 
-# StGit
-.stgit-edit.txt
 
 # Build directories:
-/binfilter/unxlng??
-/binfilter/unxlng??.pro
-/binfilter/unxlng???
-/binfilter/unxlng???.pro
-/binfilter/wntmsc???
-/binfilter/wntmsc???.pro
-/binfilter/wntgcc?
-/binfilter/wntgcc?.pro
-/binfilter/unxmac??
-/binfilter/unxmac??.pro
-/binfilter/unx?bsd??
-/binfilter/unx?bsd??.pro
-/binfilter/unxdfly??
-/binfilter/unxdfly??.pro
-/binfilter/unxso???
-/binfilter/unxso???.pro
-/binfilter/unxaig??
-/binfilter/unxaig??.pro
-/binfilter/unxios?
-/binfilter/unxios?.pro
-/binfilter/unxand?
-/binfilter/unxand?.pro
-
-# libxslt debug memdump
-.memdump
+/unxlng??
+/unxlng??.pro
+/unxlng???
+/unxlng???.pro
+/wntmsc???
+/wntmsc???.pro
+/wntgcc?
+/wntgcc?.pro
+/unxmac??
+/unxmac??.pro
+/unx?bsd??
+/unx?bsd??.pro
+/unxdfly??
+/unxdfly??.pro
+/unxso???
+/unxso???.pro
+/unxaig??
+/unxaig??.pro
+/unxios?
+/unxios?.pro
+/unxand?
+/unxand?.pro
 
 # LibreOffice lock files
 .~lock.*#
 
-# Everyone loves patching
-*.orig
-*.rej
-
-# Somepeople love debugging
-gdbtrace.log
-valgrind.log


More information about the Libreoffice-commits mailing list