summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2022-01-13 15:04:31 -0700
committerSean Whitton <spwhitton@spwhitton.name>2022-01-13 15:04:31 -0700
commitd3d55444c5cbf13c0dc1f7e4eb4326963ab733f5 (patch)
treed3877187544936a18fbb461ed51e339b89161257 /.gitignore
parent06cf9511b7ecc397597dbe937c584b65e594dac5 (diff)
parentfbffe2cc30ffd92872628a6dba2684296b535b9e (diff)
downloademacs-d3d55444c5cbf13c0dc1f7e4eb4326963ab733f5.tar.gz
Merge remote-tracking branch 'origin/master' into athena/unstable
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore5
1 files changed, 4 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index 9743ccca0cd..c53d53a972a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,6 @@
# Files that Git should ignore in the Emacs source directory.
-# Copyright 2009-2021 Free Software Foundation, Inc.
+# Copyright 2009-2022 Free Software Foundation, Inc.
# This file is part of GNU Emacs.
@@ -325,3 +325,6 @@ lib-src/seccomp-filter-exec.pfc
# gsettings schema
/etc/*.gschema.valid
+
+# Ignore directory made by admin/make-manuals.
+manual/