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 +