From 8757bf83775afe10cb18d15943248a75bcc6a24b Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Fri, 22 May 2015 09:28:43 +0100 Subject: [PATCH] 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 --- .gitignore | 26 ++++++++++++++++++++++++++ 1 file changed, 26 insertions(+) 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 -- 2.34.1