diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:12:40 -0400 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-10-12 19:12:40 -0400 |
commit | 8ff950d098146bc929504b062bcc6ccd5a2cb6ed (patch) | |
tree | e5d73cf1997b28bbaa24a693f5d8c2abb45be313 /.git.info.exclude.in | |
parent | 9d689e7d224b5c1ea3ab3018998135979f19c5a9 (diff) | |
parent | b0cdbb3da2c2b36d3c65b00db4eaf5a0d29c2cd6 (diff) |
Merge remote-tracking branch 'origin/master' into build64-par
Conflicts:
.config/bash/rc.sh
.config/login.sh
.config/ssh/config
.config/wmii/include.sh
Diffstat (limited to '.git.info.exclude.in')
-rw-r--r-- | .git.info.exclude.in | 65 |
1 files changed, 9 insertions, 56 deletions
diff --git a/.git.info.exclude.in b/.git.info.exclude.in index 0c5ce40..2d09032 100644 --- a/.git.info.exclude.in +++ b/.git.info.exclude.in @@ -1,18 +1,17 @@ # Defualt to ignoring all files /* +# except these: -# Except dotfiles -!.* +# The things I actually want to track +!/.config +!/.local* -# Or Makefile -!Makefile +# The file that generates this one +!/.git.info.exclude.in -# Ignore these for privacy -.ssh/* -!.ssh/config -.gnupg/* -!.gnupg/gpg.conf -.netrc +# The relevent programs do not like symlinks for these: +!/.gtkrc-2.0 +!/.gtkrc-2.0.mine # Ignore temp/log/history files *.log @@ -46,49 +45,3 @@ lock *~ .#* \#*# - - -# Ignore these special-purpose cache/temp files -.camel_certs -.compiz/session/* -.config/RecentDocuments/* -.dbus/session-bus/* -.ddd/sessions -.esd_auth -.evolution/.* -.gconfd/saved_state -.gnash-media -.gnash/SharedObjects/* -.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 -.git.info.exclude - -# Ignore these files for no good reason -.bogofilter -.gem -.gitk -.offlineimap -.prefix -.prefix.* -.wine* - -# Ignore these files that if I tracked them, would be a separate repo -.mozilla |