summaryrefslogtreecommitdiffstats
path: root/.gitignore
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-05-22 10:28:43 +0200
committerMatt Caswell <matt@openssl.org>2015-05-22 12:09:19 +0200
commit8757bf83775afe10cb18d15943248a75bcc6a24b (patch)
treea6389aef034df5a2d3f737dd707500bdb4579b57 /.gitignore
parentLost alert in DTLS (diff)
downloadopenssl-8757bf83775afe10cb18d15943248a75bcc6a24b.tar.xz
openssl-8757bf83775afe10cb18d15943248a75bcc6a24b.zip
Ignore files from other branches
There are a number of files that are created on other branches that are not held in git and are not needed in master. When checking out master after working on another branch these files show up in "git status", so just add them to .gitignore Reviewed-by: Richard Levitte <levitte@openssl.org>
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore26
1 files changed, 26 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index 77f8d21cbf..1ac7f75cba 100644
--- a/.gitignore
+++ b/.gitignore
@@ -109,3 +109,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