summaryrefslogtreecommitdiff
path: root/.git.info.exclude
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-05-22 23:46:29 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-05-22 23:46:29 -0400
commitd26fda540c355fa37a1381b11765c47fdc5bd006 (patch)
treef6510335adf691d662cae765cb7f77dcdcbf4efc /.git.info.exclude
parent3b8d4575218ab6d8e1155a81c45d81a8631aff25 (diff)
parent7036a9b36396ae49cf8ba0f8ad5fe139a65433c1 (diff)
Merge branch 'hp-dv6426us-par'
Conflicts: .crontab.local .git.info.exclude .wmii/wmiirc_local
Diffstat (limited to '.git.info.exclude')
-rw-r--r--.git.info.exclude30
1 files changed, 25 insertions, 5 deletions
diff --git a/.git.info.exclude b/.git.info.exclude
index 3c64803..bc11313 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -7,6 +7,13 @@
!.*/*/*
!.*/*/*/*
!.*/*/*/*/*
+!.*/*/*/*/*/*
+!.*/*/*/*/*/*/*
+!.*/*/*/*/*/*/*/*
+!.*/*/*/*/*/*/*/*/*
+!.*/*/*/*/*/*/*/*/*/*
+!.*/*/*/*/*/*/*/*/*/*/*
+!.*/*/*/*/*/*/*/*/*/*/*/*
# Or Makefile
!Makefile
@@ -38,13 +45,15 @@ tmp
history.*
*authority
*.cookie
+*.bak
# Ignore these special-purpose cache/temp files
-.alsa.save
.camel_certs
.compiz/session/*
.config/chromium/Default/History\ Index*
+.current.asound
.dbus/session-bus/*
+.ddd/history
.dvdcss
.esd_auth
.eshell/history
@@ -54,14 +63,15 @@ history.*
.gnash/SharedObjects/*
.kde/share/apps/RecentDocuments/*
.kde/socket-*
+.kde4/share/apps/RecentDocuments/*
+.kde4/share/apps/okular/docdata/*
+.kde4/socket-*
.lesshst
.links2/links.his
.local/share/Trash/*
.local/share/gvfs-metadata/*
.local/share/icons/*
-.mozilla/firefox/Crash\ Reports/*
-.netbeans/*/modules/*
-.netbeans/*/update_tracking/*
+.local/share/recently-used.xbel
.pki
.pulse
.pulse-cookie
@@ -74,15 +84,25 @@ history.*
# Ignore files that are autogenerated
.folders
.nanorc
+.config/libretools/blacklist.txt
# Ignore these files for no good reason
.terminfo
+.config/vlc/vlc-qt-interface.conf
.wine*
.offlineimap
.bogofilter
+.config/Trolltech.conf
+.gem
+
+# Ignore these files that if I tracked them, would be a separate repo
+.config/libreoffice
+.config/transmission
+.netbeans
+.mozilla
# Ignore these platform-specific files
-.alsa.full
+.full.asound
.xmodmap
*.local
*_local