summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.emacs.d/.gitignore1
-rw-r--r--.git.info.exclude1
2 files changed, 2 insertions, 0 deletions
diff --git a/.emacs.d/.gitignore b/.emacs.d/.gitignore
index 60dcaa6..2cae575 100644
--- a/.emacs.d/.gitignore
+++ b/.emacs.d/.gitignore
@@ -1,5 +1,6 @@
auto-save-list/*
el-get/*
server/*
+elmo/*
image-dired/*
session.*
diff --git a/.git.info.exclude b/.git.info.exclude
index 78497e1..34e552f 100644
--- a/.git.info.exclude
+++ b/.git.info.exclude
@@ -33,6 +33,7 @@ tmp
\#*#
.~lock.*#
*_history
+*_hist
history.*
*authority
*.cookie