X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=.gitignore;h=92f17c603250172c24d1b7d76c38b8e55f67f638;hp=77f8d21cbf1c66b87225f5a0438830081e7ad680;hb=5278dec375c9a2d991db4c533b60e09c6c80e6e3;hpb=37d92b1b2bb6e6e04d62d6f7774a2d8190a99174

diff --git a/.gitignore b/.gitignore
index 77f8d21cbf..92f17c6032 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,8 +5,9 @@
 # editor artefacts
 *.swp
 .#*
-#*#
+\#*#
 *~
+/.dir-locals.el
 
 # Top level excludes
 /Makefile.bak
@@ -26,6 +27,7 @@
 /test/.rnd
 /test/test*.pem
 /test/newkey.pem
+/test/*.log
 
 # Certificate symbolic links
 *.0
@@ -41,6 +43,7 @@
 
 # Auto generated assembly language source files
 *.s
+*.S
 !/crypto/bn/asm/pa-risc2.s
 !/crypto/bn/asm/pa-risc2W.s
 crypto/aes/asm/a_win32.asm
@@ -109,3 +112,29 @@ ms/nt.mak
 ms/ntdll.mak
 ms/ssleay32.def
 ms/version32.rc
+
+# Files created on other branches that are not held in git, and are not
+# needed on this branch
+include/openssl/asn1_mac.h
+include/openssl/des_old.h
+include/openssl/fips.h
+include/openssl/fips_rand.h
+include/openssl/krb5_asn.h
+include/openssl/kssl.h
+include/openssl/pq_compat.h
+include/openssl/ssl23.h
+include/openssl/tmdiff.h
+include/openssl/ui_compat.h
+test/fips_aesavs.c
+test/fips_desmovs.c
+test/fips_dsatest.c
+test/fips_dssvs.c
+test/fips_hmactest.c
+test/fips_randtest.c
+test/fips_rngvs.c
+test/fips_rsagtest.c
+test/fips_rsastest.c
+test/fips_rsavtest.c
+test/fips_shatest.c
+test/fips_test_suite.c
+test/shatest.c