diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..0388ac9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,7 @@
+# Patterns for all subdirectories: all kinds of automatic backup files.
+*.orig
+*.rej
+*~
+.#*
+\#*#
+
diff --git a/ChangeLog b/ChangeLog
index 35a519d..4989f91 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2012-07-01  Bruno Haible  <bruno@clisp.org>
+
+	Allow editor backup files in git checkouts.
+	* .gitignore: New file.
+
 2012-07-01  Bruno Haible  <bruno@clisp.org>
 
 	Create tarballs through an Automake-like "make dist" command.