From 3d08bc4e30224fe24ec4481cd5602faf5324913e Mon Sep 17 00:00:00 2001
From: Lars Magne Ingebrigtsen <larsi@gnus.org>
Date: Thu, 13 Nov 2014 17:58:07 +0200
Subject: [PATCH] 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.
---
 .gitignore | 48 ++++++++++++++++++++++++++++++++++++++++++++++++
 ChangeLog  |  6 ++++++
 2 files changed, 54 insertions(+)

diff --git a/.gitignore b/.gitignore
index ad4324e8e22..b5483840f3a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -21,3 +21,51 @@ etc/refcards/*.aux
 etc/refcards/*.log
 info/dir
 info/*.info
+test/biditest.txt
+
+Makefile
+config.log
+config.status
+lib-src/ctags
+lib-src/ebrowse
+lib-src/emacsclient
+lib-src/etags
+lib-src/hexl
+lib-src/make-docfile
+lib-src/movemail
+lib-src/profile
+lib-src/update-game-score
+*.o
+lib/alloca.h
+lib/arg-nonnull.h
+lib/c++defs.h
+lib/dirent.h
+lib/fcntl.h
+lib/getopt.h
+lib/inttypes.h
+lib/libgnu.a
+lib/signal.h
+lib/stdio.h
+lib/stdlib.h
+lib/string.h
+lib/sys/
+lib/time.h
+lib/unistd.h
+lib/warn-on-use.h
+src/bootstrap-emacs
+src/deps/
+src/emacs
+src/emacs-25.0.50.1
+src/emacs-25.0.50.2
+src/gl-stamp
+src/globals.h
+src/stamp-h1
+src/temacs
+doc/emacs/emacsver.texi
+doc/man/emacs.1
+etc/refcards/emacsver.tex
+lib/.deps/
+lisp/international/uni-brackets.el
+lwlib/deps/
+lwlib/liblw.a
+
diff --git a/ChangeLog b/ChangeLog
index ce0e09902d0..33c4dd924fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2014-11-13  Lars Magne Ingebrigtsen  <larsi@gnus.org>
+
+	* .gitignore: Copy over sufficient ignorable files from the old
+	.bzrignore that a simple build doesn't list lots of unregistered
+	files.
+
 2014-11-11  Eric S. Raymond  <esr@thyrsus.com>
 
 	* Makefile.in: git transition - set VCWITNESS appropriately for git.
-- 
2.11.4.GIT