diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-07-02 16:04:11 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2011-07-02 16:04:11 -0400 |
| commit | f8d7528a5a6ee83536ad397bbad8c46f5984d61f (patch) | |
| tree | 2af66ef2f73442300066ec3b3a708740857afa8c /.git.info.exclude | |
| parent | 8d5dd1b09ca02e869c89ac87f89bc790bc7c29ee (diff) | |
| parent | d383205ac60fdcf39bf2b0f813d63f91cf6e9dd5 (diff) | |
Merge branch 'master' of gitorious.org:lukeshu-dotfiles/lukeshu-dotfiles
Conflicts:
.emacs
Diffstat (limited to '.git.info.exclude')
| -rw-r--r-- | .git.info.exclude | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/.git.info.exclude b/.git.info.exclude index e950474..d57169f 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -8,6 +8,9 @@ !.*/*/*/* !.*/*/*/*/* +# Or Makefile +!Makefile + # Ignore these for privacy .ssh/* .netrc @@ -29,7 +32,9 @@ tmp \#*# .~lock.*# *_history +history.* *authority +*.cookie # Ignore these special-purpose cache/temp files .xsession-errors* @@ -56,17 +61,21 @@ tmp .gconfd/saved_state .esd_auth .recently-used.xbel* +.pulse +.pulse-cookie +.pki +.alsa.save -# Include these non-dotfiles -!bin -!bin/v-www-browser -!bin/v-editor -!bin/editor - -!share -!share/nano -!share/nano/*.nanorc +# Ignore files that are autogenerated +.folders +.nanorc # Ignore these files for no good reason .terminfo -.wine*
\ No newline at end of file +.wine* +.prefix +.offlineimap +.crontab.local +.elmo +.ido.last +.bogofilter/* |