diff --git a/.gitignore b/.gitignore index b3a9a9c7972..d40f09a182a 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,11 @@ # along with GNU Emacs. If not, see . +# Currently we assume only Git 1.7.1 (April 2010) or later, so this +# file does not rely on "**" in patterns. The "**" feature was added +# in Git 1.8.2 (March 2013). + + # Built by 'autogen.sh'. /aclocal.m4 /configure @@ -72,10 +77,10 @@ src/buildobj.h src/globals.h # Lisp-level sources built by 'make'. +*cus-load.el +*loaddefs.el leim/changed.misc leim/changed.tit -lisp/**/*cus-load.el -lisp/**/*loaddefs.el lisp/cedet/semantic/bovine/c-by.el lisp/cedet/semantic/bovine/make-by.el lisp/cedet/semantic/bovine/scm-by.el diff --git a/ChangeLog b/ChangeLog index 0cf1fe668f8..c70503cf218 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,7 @@ 2014-12-01 Paul Eggert * .gitignore: Remove redundant pattern (subsumed by _*). + Avoid "**", as it requires Git 1.8.2 or later. 2014-11-21 Paul Eggert