aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLars Magne Ingebrigtsen2014-11-13 17:58:07 +0200
committerEli Zaretskii2014-11-13 17:58:07 +0200
commit3d08bc4e30224fe24ec4481cd5602faf5324913e (patch)
treeb263799f9952a466567e68f58bbbea697120d810
parente18c2a53a9813617cfe4862dc03ddd7666133b58 (diff)
downloademacs-3d08bc4e30224fe24ec4481cd5602faf5324913e.tar.gz
emacs-3d08bc4e30224fe24ec4481cd5602faf5324913e.zip
Backport .gitignore changes from master.
.gitignore: Copy over sufficient ignorable files from the old .bzrignore that a simple build doesn't list lots of unregistered files.
-rw-r--r--.gitignore48
-rw-r--r--ChangeLog6
2 files changed, 54 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index ad4324e8e22..b5483840f3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,51 @@ etc/refcards/*.aux
21etc/refcards/*.log 21etc/refcards/*.log
22info/dir 22info/dir
23info/*.info 23info/*.info
24test/biditest.txt
25
26Makefile
27config.log
28config.status
29lib-src/ctags
30lib-src/ebrowse
31lib-src/emacsclient
32lib-src/etags
33lib-src/hexl
34lib-src/make-docfile
35lib-src/movemail
36lib-src/profile
37lib-src/update-game-score
38*.o
39lib/alloca.h
40lib/arg-nonnull.h
41lib/c++defs.h
42lib/dirent.h
43lib/fcntl.h
44lib/getopt.h
45lib/inttypes.h
46lib/libgnu.a
47lib/signal.h
48lib/stdio.h
49lib/stdlib.h
50lib/string.h
51lib/sys/
52lib/time.h
53lib/unistd.h
54lib/warn-on-use.h
55src/bootstrap-emacs
56src/deps/
57src/emacs
58src/emacs-25.0.50.1
59src/emacs-25.0.50.2
60src/gl-stamp
61src/globals.h
62src/stamp-h1
63src/temacs
64doc/emacs/emacsver.texi
65doc/man/emacs.1
66etc/refcards/emacsver.tex
67lib/.deps/
68lisp/international/uni-brackets.el
69lwlib/deps/
70lwlib/liblw.a
71
diff --git a/ChangeLog b/ChangeLog
index ce0e09902d0..33c4dd924fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
12014-11-13 Lars Magne Ingebrigtsen <larsi@gnus.org>
2
3 * .gitignore: Copy over sufficient ignorable files from the old
4 .bzrignore that a simple build doesn't list lots of unregistered
5 files.
6
12014-11-11 Eric S. Raymond <esr@thyrsus.com> 72014-11-11 Eric S. Raymond <esr@thyrsus.com>
2 8
3 * Makefile.in: git transition - set VCWITNESS appropriately for git. 9 * Makefile.in: git transition - set VCWITNESS appropriately for git.