Merge remote-tracking branch 'upstream/debian/sid' into feature/apt-download-file

[apt.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index e66f9df3b2c354eb0d18f94fab352dff2c27a17f..69a229c3ec8e42fe998f0ca2526428365e32796d 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+*~
 # build artifacts
 /aclocal.m4
 /autom4te.cache/
@@ -14,6 +15,7 @@
 /doc/*/
 !/doc/examples/
 !/doc/po/
+!/doc/en/makefile
 
 # package building artifacts
 /debian/*.log
@@ -30,7 +32,12 @@
 /debian/apt-transport-https/
 
 # generated from *.in files
+/cmdline/apt-key
+/doc/apt-vendor.ent
 /doc/examples/sources.list
 /debian/libapt-pkg*.install
 /debian/libapt-inst*.install
 /debian/libapt-pkg-dev.install
+/vendor/current
+/vendor/debian/sources.list
+/vendor/ubuntu/sources.list