From 14c009c8f857faf91cb1f1c25d6d39ac4e1331fc Mon Sep 17 00:00:00 2001 From: Gerhard Hoffmann Date: Thu, 9 Jun 2022 14:49:32 +0200 Subject: [PATCH] add hooks dir --- .../UpdateController/workspace/customer_szeged_281/.gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/home/root/szeged/UpdateController/workspace/customer_szeged_281/.gitignore b/home/root/szeged/UpdateController/workspace/customer_szeged_281/.gitignore index 9253b57..dd0baba 100644 --- a/home/root/szeged/UpdateController/workspace/customer_szeged_281/.gitignore +++ b/home/root/szeged/UpdateController/workspace/customer_szeged_281/.gitignore @@ -1,6 +1,8 @@ * +## Except !**/.gitignore +!**/.git/hooks !/etc/*.ini !/etc/atb/*.ini !/etc/psa_config/* @@ -12,3 +14,5 @@ !/opt/app/sysconfig/*.ini !/opt/app/ISMASMgr/*.ini +!**/.githooks/post-merge +