From bf204bd05c3ae650f87e2b96527688579f59774c Mon Sep 17 00:00:00 2001
From: Damien Miller <djm@mindrot.org>
Date: Thu, 13 Jun 2024 15:00:28 +1000
Subject: prepare for checking in autogenerated files

We plan to check in automatically generated files (config.h.in, etc) on
release branches. These files are normally ignored by .gitignore, but
this shuffles the contents of this file to make it easy to un-ignore
them.
---
 .gitignore | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 7fccc6fe3..213041656 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,18 +1,14 @@
 Makefile
 buildpkg.sh
 config.h
-config.h.in
 config.h.in~
 config.log
 config.status
-configure
-aclocal.m4
 openbsd-compat/Makefile
 openbsd-compat/regress/Makefile
 openssh.xml
 opensshd.init
 survey.sh
-**/*.0
 **/*.o
 **/*.lo
 **/*.so
@@ -36,3 +32,10 @@ sshd
 !regress/misc/fuzz-harness/Makefile
 !regress/unittests/sshsig/Makefile
 tags
+
+# Ignored on main branch
+config.h.in
+configure
+aclocal.m4
+ChangeLog
+**/*.0
-- 
cgit v1.2.3