diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:50:32 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-27 15:50:32 -0400 |
| commit | 9e79a6c3bbc37c2eec19e055566440f0b1173c5c (patch) | |
| tree | 7516e65c0289b9a68b3a97fe2abbdf0d7dba8d8d /.git.info.exclude | |
| parent | 5c42078bd052705b69d6ea93ff7617445be43789 (diff) | |
| parent | d65775a22e1648eca8e74389a4d9c1c299017cf3 (diff) | |
Merge remote-tracking branch 'origin/master' into purdue-cs
Conflicts:
.config/X11/clientrc
.config/bash/rc.d/emacs.sh
.config/bash/rc.sh
.config/conkeror
.config/conkerorrc
.config/emacs/custom.el
.config/irbrc
.config/login.sh
.config/maildirproc/att.rc
.config/maildirproc/default.rc
.config/offlineimaprc
.config/ssh/config
.config/wmii-hg/autostart
.config/wmii-hg/include.sh
.config/wmii-hg/quit
.config/wmii-hg/rbar_battery
.config/wmii-hg/rbar_clock
.config/wmii-hg/rbar_cpu
.config/wmii-hg/rbar_wifi
.conkerorrc
.maildirproc/default.rc
Diffstat (limited to '.git.info.exclude')
| -rw-r--r-- | .git.info.exclude | 107 |
1 files changed, 0 insertions, 107 deletions
diff --git a/.git.info.exclude b/.git.info.exclude deleted file mode 100644 index 871ebf6..0000000 --- a/.git.info.exclude +++ /dev/null @@ -1,107 +0,0 @@ -# Defualt to ignoring all files -/* - -# Except dotfiles -!.* - -# Or Makefile -!Makefile - -# Ignore these for privacy -.ssh/* -!.ssh/config -.gnupg/* -!.gnupg/gpg.conf -.netrc - -# Ignore temp/log/history files -*.log -log* - -*.tmp -*.tmp.* -tmp.* -tmp-* -tmp - -*_history -*_hist -history.* -history - -*.lock -.~lock.*# -lock - -*.state -*.cookie -*.bak - -*authority -*cache* - -# Ignore files left by editors -*~ -.#* -\#*# - - -# Ignore these special-purpose cache/temp files -.camel_certs -.compiz/session/* -.config/chromium/Default/History\ Index* -.current.asound -.dbus/session-bus/* -.ddd/sessions -.dvdcss -.esd_auth -.evolution/.* -.gconfd/saved_state -.gnash-media -.gnash/SharedObjects/* -.kde/share/apps/RecentDocuments/* -.kde/socket-* -.kde4/share/apps/RecentDocuments/* -.kde4/share/apps/okular/docdata/* -.kde4/socket-* -.lesshst -.link*/*.his -.local/share/Trash/* -.local/share/gvfs-metadata/* -.local/share/icons/* -.local/share/recently-used.xbel -.pki -.pulse -.pulse-cookie -.recently-used -.recently-used.xbel* -.setroubleshoot -.shotwell/thumbs/* -.sudo_as_admin_successful -.thumbnails/* -.wireshark/recent* -.xsession-errors* - -# Ignore files that are autogenerated -.folders -.nanorc -.config/libretools/blacklist.txt - -# Ignore these files for no good reason -.bogofilter -.config/Trolltech.conf -.config/vlc -.gem -.offlineimap -.prefix -.prefix.* -.terminfo -.wine* - -# Ignore these files that if I tracked them, would be a separate repo -.config/chromium -.config/libreoffice -.config/transmission -.eclipse -.mozilla -.netbeans |