aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaul Eggert2014-12-01 09:16:04 -0800
committerPaul Eggert2014-12-01 09:16:56 -0800
commit11b65bc080884362f65bf639fddcdb58ad023fbf (patch)
treee873009abd884791bb1955b9c6da286b280f7e50
parentd83f0618d4e0f2772e307550e309c6f7cc5623d3 (diff)
downloademacs-11b65bc080884362f65bf639fddcdb58ad023fbf.tar.gz
emacs-11b65bc080884362f65bf639fddcdb58ad023fbf.zip
* .gitignore: Avoid "**", as it requires Git 1.8.2 or later.
-rw-r--r--.gitignore9
-rw-r--r--ChangeLog1
2 files changed, 8 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore
index b3a9a9c7972..d40f09a182a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -18,6 +18,11 @@
18# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>. 18# along with GNU Emacs. If not, see <http://www.gnu.org/licenses/>.
19 19
20 20
21# Currently we assume only Git 1.7.1 (April 2010) or later, so this
22# file does not rely on "**" in patterns. The "**" feature was added
23# in Git 1.8.2 (March 2013).
24
25
21# Built by 'autogen.sh'. 26# Built by 'autogen.sh'.
22/aclocal.m4 27/aclocal.m4
23/configure 28/configure
@@ -72,10 +77,10 @@ src/buildobj.h
72src/globals.h 77src/globals.h
73 78
74# Lisp-level sources built by 'make'. 79# Lisp-level sources built by 'make'.
80*cus-load.el
81*loaddefs.el
75leim/changed.misc 82leim/changed.misc
76leim/changed.tit 83leim/changed.tit
77lisp/**/*cus-load.el
78lisp/**/*loaddefs.el
79lisp/cedet/semantic/bovine/c-by.el 84lisp/cedet/semantic/bovine/c-by.el
80lisp/cedet/semantic/bovine/make-by.el 85lisp/cedet/semantic/bovine/make-by.el
81lisp/cedet/semantic/bovine/scm-by.el 86lisp/cedet/semantic/bovine/scm-by.el
diff --git a/ChangeLog b/ChangeLog
index 0cf1fe668f8..c70503cf218 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,6 +1,7 @@
12014-12-01 Paul Eggert <eggert@cs.ucla.edu> 12014-12-01 Paul Eggert <eggert@cs.ucla.edu>
2 2
3 * .gitignore: Remove redundant pattern (subsumed by _*). 3 * .gitignore: Remove redundant pattern (subsumed by _*).
4 Avoid "**", as it requires Git 1.8.2 or later.
4 5
52014-11-21 Paul Eggert <eggert@cs.ucla.edu> 62014-11-21 Paul Eggert <eggert@cs.ucla.edu>
6 7