summaryrefslogtreecommitdiff
path: root/.git.info.exclude
diff options
context:
space:
mode:
authorLuke Shumaker <LukeShu@sbcglobal.net>2012-04-11 23:01:21 -0400
committerLuke Shumaker <LukeShu@sbcglobal.net>2012-04-11 23:01:21 -0400
commit6c0a5af3aba9902206a73a62e2be2e4dd67be9da (patch)
treecbc0dbb938716a80cc0248b5aff97dc34f21c756 /.git.info.exclude
parentebc4f813d517d44ddf7440fd8043c5d41adf8932 (diff)
parenta96ee608ce4be813ce381a6a0c195591f633986e (diff)
Merge branch 'hp-dv6426us-par' into identica-mode-1.2hp-dv6426us-par/identica-mode-1.2
Conflicts: .emacs
Diffstat (limited to '.git.info.exclude')
-rw-r--r--.git.info.exclude54
1 files changed, 27 insertions, 27 deletions
diff --git a/.git.info.exclude b/.git.info.exclude
index 35e6e7e..ab160af 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -13,8 +13,10 @@
# Ignore these for privacy
.ssh/*
-.netrc
+!.ssh/config
.gnupg/*
+!.gnupg/gpg.conf
+.netrc
# Ignore temp/log/history files
*.log
@@ -32,39 +34,42 @@ tmp
\#*#
.~lock.*#
*_history
+*_hist
history.*
*authority
*.cookie
# Ignore these special-purpose cache/temp files
-.xsession-errors*
+.alsa.save
.camel_certs
-.kde/socket-*
+.compiz/session/*
+.config/chromium/Default/History\ Index*
+.dbus/session-bus/*
+.dvdcss
+.esd_auth
+.eshell/history
+.evolution/.*
+.gconfd/saved_state
+.gnash-media
+.gnash/SharedObjects/*
.kde/share/apps/RecentDocuments/*
+.kde/socket-*
+.lesshst
+.links2/links.his
+.local/share/Trash/*
.local/share/gvfs-metadata/*
.local/share/icons/*
.mozilla/firefox/Crash\ Reports/*
-.compiz/session/*
-.dbus/session-bus/*
-.thumbnails/*
-.gnash/SharedObjects/*
-.config/chromium/Default/History\ Index*
-.evolution/.*
-.shotwell/thumbs/*
-.netbeans/*/update_tracking/*
.netbeans/*/modules/*
-.local/share/Trash/*
-.links2/links.his
-.eshell/history
-.sudo_as_admin_successful
-.lesshst
-.gconfd/saved_state
-.esd_auth
-.recently-used.xbel*
+.netbeans/*/update_tracking/*
+.pki
.pulse
.pulse-cookie
-.pki
-.alsa.save
+.recently-used.xbel*
+.shotwell/thumbs/*
+.sudo_as_admin_successful
+.thumbnails/*
+.xsession-errors*
# Ignore files that are autogenerated
.folders
@@ -73,10 +78,5 @@ history.*
# Ignore these files for no good reason
.terminfo
.wine*
-.prefix
.offlineimap
-.crontab.local
-.xmodmap
-.elmo
-.ido.last
-.bogofilter/*
+.bogofilter