From fd31e45e4bccd7070d02e4d20bcab1f45b271600 Mon Sep 17 00:00:00 2001
From: Bram Moolenaar <Bram@vim.org>
Date: Tue, 7 May 2019 21:48:51 +0200
Subject: patch 8.1.1290: .hgignore and .gitignore are either distributed or in
 git

Problem:    .hgignore and .gitignore are either distributed or in git, not
            both.
Solution:   Add .gitignore to the distribution and .hgignore to git.  Update
            the entries. (Christian Brabandt, Ken Takata)
---
 .gitignore | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

(limited to '.gitignore')

diff --git a/.gitignore b/.gitignore
index 85e482d1f7..5767bae79c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,16 +6,15 @@ src/auto/if_perl.c
 src/auto/gui_gtk_gresources.c
 src/auto/gui_gtk_gresources.h
 src/objects/.dirstamp
+src/objects
 src/tags
 
 # We do need src/auto/configure.
-src/auto/config.aap
 src/auto/config.cache
 src/auto/config.h
 src/auto/config.log
 src/auto/config.mk
 src/auto/config.status
-src/auto/configure.aap
 src/auto/osdef.h
 src/auto/link.log
 src/auto/link.sed
@@ -26,6 +25,7 @@ src/auto/pathdef.c
 *.idb
 *.manifest
 *.exp
+*.map
 *.obj
 *.pdb
 *.ilk
@@ -35,13 +35,13 @@ src/auto/pathdef.c
 *.RES
 vim*.dll
 vim*.lib
-src/if_perl.c
 src/pathdef.c
 src/Obj*/pathdef.c
 gvimext.dll
 gvimext.lib
 gvim.lib
 runtime/doc/uganda.nsis.txt
+nsis/icons/*
 
 # Borland C++
 bcc.cfg
@@ -49,7 +49,6 @@ bcc.cfg
 *.ild
 *.ilf
 *.ils
-*.map
 *.tds
 
 # NetBeans
@@ -88,3 +87,16 @@ src/memfile_test
 src/json_test
 src/message_test
 src/kword_test
+
+# Generated by "make install"
+runtime/doc/tags
+
+# Generated by "make shadow".  The directory names could be anything but we
+# restrict them to shadow (the default) or shadow-*
+src/shadow
+src/shadow-*
+src/runtime
+src/pixmaps
+
+# other possible files build by tools
+src/cscope.out
-- 
cgit v1.2.3