aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRüdiger Sonderfeld2013-12-19 19:00:05 +0100
committerRüdiger Sonderfeld2013-12-19 19:00:05 +0100
commit4094a7725a4b15cce5a488fc9aabf1a48e5f755d (patch)
tree1115173bbf643e1aecbad7f2c1f77c517d60509a
parent79f7284f9607a4a9edf53f8643825e699d3683f6 (diff)
downloademacs-4094a7725a4b15cce5a488fc9aabf1a48e5f755d.tar.gz
emacs-4094a7725a4b15cce5a488fc9aabf1a48e5f755d.zip
Update .gitignore.
It should probably be kept better in sync with .bzrignore. * .gitignore: Ignore refcard temporaries and info/*.info files.
-rw-r--r--.gitignore3
-rw-r--r--ChangeLog4
2 files changed, 7 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 1ee08d84907..4bb9152f776 100644
--- a/.gitignore
+++ b/.gitignore
@@ -17,3 +17,6 @@ TAGS
17/bin/ 17/bin/
18/site-lisp/ 18/site-lisp/
19/leim/ja-dic/ 19/leim/ja-dic/
20etc/refcards/*.aux
21etc/refcards/*.log
22info/*.info
diff --git a/ChangeLog b/ChangeLog
index 9bc922990a8..3e8dc23db12 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
12013-12-19 Rüdiger Sonderfeld <ruediger@c-plusplus.de>
2
3 * .gitignore: Ignore refcard temporaries and info/*.info files.
4
12013-12-17 Paul Eggert <eggert@cs.ucla.edu> 52013-12-17 Paul Eggert <eggert@cs.ucla.edu>
2 6
3 Merge from gnulib, incorporating: 7 Merge from gnulib, incorporating: