From 61da0031b2a0036680d9e0f822619ecc116f1178 Mon Sep 17 00:00:00 2001 From: David Sommerseth Date: Fri, 20 Jan 2017 22:04:57 +0100 Subject: [PATCH] git: Merge .gitignore files into a single file We already track a lot of files over the whole directory structure in the main .gitignore file. But a few additional ones had been added into some of the subdirectories. This unifies all these files into a master file for the whole project, making it easier to know where to look at and edit if changes needs to be done. Signed-off-by: David Sommerseth Acked-by: Steffan Karger Message-Id: <20170120210457.3383-1-davids@openvpn.net> URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg13916.html Signed-off-by: David Sommerseth (cherry picked from commit d14b3c60c7796736e07bc3cddb0ab3a58475793e) --- .gitignore | 6 ++++++ sample/sample-keys/.gitignore | 1 - tests/unit_tests/.gitignore | 1 - vendor/.gitignore | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) delete mode 100644 sample/sample-keys/.gitignore delete mode 100644 tests/unit_tests/.gitignore delete mode 100644 vendor/.gitignore diff --git a/.gitignore b/.gitignore index e3825cd85..f6361ec66 100644 --- a/.gitignore +++ b/.gitignore @@ -51,9 +51,15 @@ config-msvc-local.h config-msvc-version.h doc/openvpn.8.html distro/rpm/openvpn.spec +sample/sample-keys/sample-ca/ +vendor/.build +vendor/dist + tests/t_client.sh tests/t_client-*-20??????-??????/ t_client.rc t_client_ips.rc +tests/unit_tests/**/*_testdriver + src/openvpn/openvpn config-version.h diff --git a/sample/sample-keys/.gitignore b/sample/sample-keys/.gitignore deleted file mode 100644 index f14875284..000000000 --- a/sample/sample-keys/.gitignore +++ /dev/null @@ -1 +0,0 @@ -sample-ca/ diff --git a/tests/unit_tests/.gitignore b/tests/unit_tests/.gitignore deleted file mode 100644 index 8655de834..000000000 --- a/tests/unit_tests/.gitignore +++ /dev/null @@ -1 +0,0 @@ -*_testdriver diff --git a/vendor/.gitignore b/vendor/.gitignore deleted file mode 100644 index e11dfecdd..000000000 --- a/vendor/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.build/ -dist/ -- 2.47.2