diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-16 23:55:23 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-07-16 23:55:23 -0400 |
| commit | 4dcf99a241f8591b21ce3e8b2dd385cbeb99bbf6 (patch) | |
| tree | b275d7a21d46c421d9487dcd1d5043ba8a9bfe5d /.git.info.exclude | |
| parent | 3b8d4575218ab6d8e1155a81c45d81a8631aff25 (diff) | |
| parent | 3c7c6090cd2e385651f6ef79391c42a65ac06344 (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.exclude | 32 |
1 files changed, 23 insertions, 9 deletions
diff --git a/.git.info.exclude b/.git.info.exclude index 3c64803..235367c 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,19 @@ 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 platform-specific files -.alsa.full -.xmodmap -*.local -*_local +# Ignore these files that if I tracked them, would be a separate repo +.config/libreoffice +.config/transmission +.netbeans +.mozilla |