Generate a ChangeLog file from commit logs

[gnu-emacs] / .gitignore

diff --git a/.gitignore b/.gitignore
index 6702a192bcb36323a70bbd18ecc9d9313381dbdd..67d286535495f8ca0e7a35523588c6700ca59e4b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
 # Files that Git should ignore in the Emacs source directory.
 
-# Copyright 2009-2014 Free Software Foundation, Inc.
+# Copyright 2009-2015 Free Software Foundation, Inc.
 
 # This file is part of GNU Emacs.
 
@@ -41,13 +41,14 @@ InfoPlist.strings
 Makefile
 !admin/charsets/Makefile
 !etc/refcards/Makefile
-!test/automated/flymake/warnpred/Makefile
+!test/automated/data/flymake/Makefile
 !test/indent/Makefile
 makefile
 /*.cache
 /confdefs.h
 /config.status
 /configure.lineno
+/conftest*
 src/config.h
 src/epaths.h
 
@@ -64,10 +65,8 @@ lib/getopt.h
 lib/inttypes.h
 lib/libgnu.a
 lib/signal.h
-lib/stdalign.h
-lib/stdint.h
-lib/stdio.h
-lib/stdlib.h
+lib/std*.h
+!lib/std*.in.h
 lib/string.h
 lib/sys/
 lib/time.h
@@ -145,6 +144,7 @@ src/*.map
 
 # Tests.
 test/indent/*.new
+test/biditest.txt
 
 # ctags, etags.
 TAGS
@@ -224,8 +224,11 @@ lisp/international/uni-*.el
 *.tps
 *.vr
 *.vrs
+doc/emacs/emacsver.texi
+doc/man/emacs.1
 doc/misc/cc-mode.ss
 etc/DOC
+etc/refcards/emacsver.tex
 info/dir
 
 # Version control and locks.
@@ -234,6 +237,7 @@ info/dir
 *~
 .#*
 \#*\#
+ChangeLog
 [0-9]*.patch
 
 # Built by 'make install'.
@@ -257,5 +261,7 @@ lib/SYS/
 /README.W32
 /share/
 /site-lisp/
+nt/emacs.rc
+nt/emacsclient.rc
 src/gdb.ini
 /var/