diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-27 10:56:32 -0400 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-08-27 10:56:32 -0400 |
| commit | e038ffc1843d417174ade379742e57cfd63806ab (patch) | |
| tree | ede1bed7e0b49d4eccc001e3f9f9b0f9b072edf2 | |
| parent | 836fd82b9d81bab9f13084c2484612676924f428 (diff) | |
| parent | d794d461f2e91af847beed7783cde2c7e65fd725 (diff) | |
Merge branch 'master' into hp-dv6426us-par
| -rw-r--r-- | .git.info.exclude | 33 | ||||
| -rw-r--r-- | .login-daemons | 2 |
2 files changed, 22 insertions, 13 deletions
diff --git a/.git.info.exclude b/.git.info.exclude index 4576b6f..a2d075e 100644 --- a/.git.info.exclude +++ b/.git.info.exclude @@ -28,36 +28,44 @@ # Ignore temp/log/history files *.log log* -*cache* + *.tmp *.tmp.* tmp.* tmp-* tmp -*.lock -*.state -*~ -.#* -\#*# -.~lock.*# + *_history *_hist history.* -*authority +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/history .ddd/sessions .dvdcss .esd_auth -.eshell/history .evolution/.* .gconfd/saved_state .gnash-media @@ -68,7 +76,7 @@ history.* .kde4/share/apps/okular/docdata/* .kde4/socket-* .lesshst -.links2/links.his +.link*/*.his .local/share/Trash/* .local/share/gvfs-metadata/* .local/share/icons/* @@ -76,10 +84,13 @@ history.* .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 diff --git a/.login-daemons b/.login-daemons index 380b3f1..bf8cf21 100644 --- a/.login-daemons +++ b/.login-daemons @@ -1,8 +1,6 @@ #!/bin/sh if [ -x "`which daemon`" ]; then - daemon emacs --daemon - daemon sysfiles daemon maildirproc daemon gpg-agent --daemon --write-env-file "${HOME}/.gnupg/agent-info" daemon batterymon 20 " |