[#1602] regenerate .gitattributes

diff --git a/src/bin/admin/.gitattributes b/src/bin/admin/.gitattributes
deleted file mode 100644 (file)
index 5601c44..0000000
--- a/src/bin/admin/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-/messages.cc    -diff merge=ours
-/messages.h     -diff merge=ours

diff --git a/src/bin/agent/.gitattributes b/src/bin/agent/.gitattributes
index 718527940f077a417c8cf7562be611773c7d3508..28e66530188b2bff30feb10eaafe4acc35b88d91 100644 (file)
--- a/src/bin/agent/.gitattributes
+++ b/src/bin/agent/.gitattributes
@@ -1,9 +1,8 @@
-/ca_messages.cc     -diff merge=ours
-/ca_messages.h      -diff merge=ours
-/agent_lexer.cc     -diff merge=ours
-/agent_lexer.h      -diff merge=ours
-/agent_parser.cc    -diff merge=ours
-/agent_parser.h     -diff merge=ours
-/location.hh        -diff merge=ours
-/position.hh        -diff merge=ours
-/stack.hh           -diff merge=ours
+/agent_lexer.cc                  -diff merge=ours
+/agent_parser.cc                 -diff merge=ours
+/agent_parser.h                  -diff merge=ours
+/ca_messages.cc                  -diff merge=ours
+/ca_messages.h                   -diff merge=ours
+/location.hh                     -diff merge=ours
+/position.hh                     -diff merge=ours
+/stack.hh                        -diff merge=ours

diff --git a/src/bin/d2/.gitattributes b/src/bin/d2/.gitattributes
index 2f739dc3f6e2c2fc361678bb98711cb1c78f207c..321e14cfafc3147dca0ae7ddbd7782efa077b6ee 100644 (file)
--- a/src/bin/d2/.gitattributes
+++ b/src/bin/d2/.gitattributes
@@ -1,8 +1,8 @@
-/d2_messages.cc -diff merge=ours
-/d2_messages.h  -diff merge=ours
-/d2_lexer.cc    -diff merge=ours
-/d2_parser.cc   -diff merge=ours
-/d2_parser.h    -diff merge=ours
-/location.hh    -diff merge=ours
-/position.hh    -diff merge=ours
-/stack.hh       -diff merge=ours
+/d2_lexer.cc                     -diff merge=ours
+/d2_messages.cc                  -diff merge=ours
+/d2_messages.h                   -diff merge=ours
+/d2_parser.cc                    -diff merge=ours
+/d2_parser.h                     -diff merge=ours
+/location.hh                     -diff merge=ours
+/position.hh                     -diff merge=ours
+/stack.hh                        -diff merge=ours

diff --git a/src/bin/dhcp4/.gitattributes b/src/bin/dhcp4/.gitattributes
index 85d246b5b34a1cc5bb1277b183f1e933abcef2da..17f2596b46683c7da1e38f6d37d2aa5a2baaa6db 100644 (file)
--- a/src/bin/dhcp4/.gitattributes
+++ b/src/bin/dhcp4/.gitattributes
@@ -1,8 +1,8 @@
-/dhcp4_messages.cc  -diff merge=ours
-/dhcp4_messages.h   -diff merge=ours
-/dhcp4_lexer.cc     -diff merge=ours
-/dhcp4_parser.cc    -diff merge=ours
-/dhcp4_parser.h     -diff merge=ours
-/location.hh        -diff merge=ours
-/position.hh        -diff merge=ours
-/stack.hh           -diff merge=ours
+/dhcp4_lexer.cc                  -diff merge=ours
+/dhcp4_messages.cc               -diff merge=ours
+/dhcp4_messages.h                -diff merge=ours
+/dhcp4_parser.cc                 -diff merge=ours
+/dhcp4_parser.h                  -diff merge=ours
+/location.hh                     -diff merge=ours
+/position.hh                     -diff merge=ours
+/stack.hh                        -diff merge=ours

diff --git a/src/bin/dhcp6/.gitattributes b/src/bin/dhcp6/.gitattributes
index 7e07bbc4bb9c9d8052c66b1b82e9935c40063b90..ed120aeec60603194b62185f0df238d9f1a38f61 100644 (file)
--- a/src/bin/dhcp6/.gitattributes
+++ b/src/bin/dhcp6/.gitattributes
@@ -1,8 +1,8 @@
-/dhcp6_messages.cc  -diff merge=ours
-/dhcp6_messages.h   -diff merge=ours
-/dhcp6_lexer.cc     -diff merge=ours
-/dhcp6_parser.cc    -diff merge=ours
-/dhcp6_parser.h     -diff merge=ours
-/location.hh        -diff merge=ours
-/position.hh        -diff merge=ours
-/stack.hh           -diff merge=ours
+/dhcp6_lexer.cc                  -diff merge=ours
+/dhcp6_messages.cc               -diff merge=ours
+/dhcp6_messages.h                -diff merge=ours
+/dhcp6_parser.cc                 -diff merge=ours
+/dhcp6_parser.h                  -diff merge=ours
+/location.hh                     -diff merge=ours
+/position.hh                     -diff merge=ours
+/stack.hh                        -diff merge=ours

diff --git a/src/bin/lfc/.gitattributes b/src/bin/lfc/.gitattributes
index ae10a519d5e7a453deef5afafff9574674292248..cdc3b102d4b38841698804acbfcf871699adf82e 100644 (file)
--- a/src/bin/lfc/.gitattributes
+++ b/src/bin/lfc/.gitattributes
@@ -1,2 +1,2 @@
-/lfc_messages.cc    -diff merge=ours
-/lfc_messages.h     -diff merge=ours
+/lfc_messages.cc                 -diff merge=ours
+/lfc_messages.h                  -diff merge=ours

diff --git a/src/bin/netconf/.gitattributes b/src/bin/netconf/.gitattributes
index 393bc7da498790255356ee9880e131d07b8a844c..cccfd3df0984926d3b675a6fec442ffa2ff25093 100644 (file)
--- a/src/bin/netconf/.gitattributes
+++ b/src/bin/netconf/.gitattributes
@@ -1,8 +1,8 @@
-/netconf_lexer.cc       -diff merge=ours
-/netconf_messages.cc    -diff merge=ours
-/netconf_messages.h     -diff merge=ours
-/netconf_parser.cc      -diff merge=ours
-/netconf_parser.h       -diff merge=ours
-/location.hh            -diff merge=ours
-/position.hh            -diff merge=ours
-/stack.hh               -diff merge=ours
+/location.hh                     -diff merge=ours
+/netconf_lexer.cc                -diff merge=ours
+/netconf_messages.cc             -diff merge=ours
+/netconf_messages.h              -diff merge=ours
+/netconf_parser.cc               -diff merge=ours
+/netconf_parser.h                -diff merge=ours
+/position.hh                     -diff merge=ours
+/stack.hh                        -diff merge=ours

diff --git a/src/hooks/dhcp/bootp/.gitattributes b/src/hooks/dhcp/bootp/.gitattributes
new file mode 100644 (file)
index 0000000..ca4f3ac
--- /dev/null
+++ b/src/hooks/dhcp/bootp/.gitattributes
@@ -0,0 +1,2 @@
+/bootp_messages.cc               -diff merge=ours
+/bootp_messages.h                -diff merge=ours

diff --git a/src/hooks/dhcp/flex_option/.gitattributes b/src/hooks/dhcp/flex_option/.gitattributes
new file mode 100644 (file)
index 0000000..7a68d16
--- /dev/null
+++ b/src/hooks/dhcp/flex_option/.gitattributes
@@ -0,0 +1,2 @@
+/flex_option_messages.cc         -diff merge=ours
+/flex_option_messages.h          -diff merge=ours

diff --git a/src/hooks/dhcp/high_availability/.gitattributes b/src/hooks/dhcp/high_availability/.gitattributes
index 12dbde4b358fdf70aeffa80fb6c82f04a9dd64c0..bb3069804cc9c38eca034ff63e2d5763c0eb93ca 100644 (file)
--- a/src/hooks/dhcp/high_availability/.gitattributes
+++ b/src/hooks/dhcp/high_availability/.gitattributes
@@ -1,2 +1,2 @@
-/ha_messages.cc -diff merge=ours
-/ha_messages.h  -diff merge=ours
+/ha_messages.cc                  -diff merge=ours
+/ha_messages.h                   -diff merge=ours

diff --git a/src/hooks/dhcp/lease_cmds/.gitattributes b/src/hooks/dhcp/lease_cmds/.gitattributes
index 62f0b93729b56b78bc0c1fcb4526804818df832e..d4fd7a2ee9b227f906eee14ae705702d88ad6555 100644 (file)
--- a/src/hooks/dhcp/lease_cmds/.gitattributes
+++ b/src/hooks/dhcp/lease_cmds/.gitattributes
@@ -1,2 +1,2 @@
-/lease_cmds_messages.cc -diff merge=ours
-/lease_cmds_messages.h  -diff merge=ours
+/lease_cmds_messages.cc          -diff merge=ours
+/lease_cmds_messages.h           -diff merge=ours

diff --git a/src/hooks/dhcp/mysql_cb/.gitattributes b/src/hooks/dhcp/mysql_cb/.gitattributes
index 04833b3d8b02fe8dda2c0e6092e77408ae07de67..99ccfa7a925fba3a63fdef59316aa742b526ca2d 100644 (file)
--- a/src/hooks/dhcp/mysql_cb/.gitattributes
+++ b/src/hooks/dhcp/mysql_cb/.gitattributes
@@ -1,2 +1,2 @@
-/mysql_cb_messages.cc   -diff merge=ours
-/mysql_cb_messages.h    -diff merge=ours
+/mysql_cb_messages.cc            -diff merge=ours
+/mysql_cb_messages.h             -diff merge=ours

diff --git a/src/hooks/dhcp/stat_cmds/.gitattributes b/src/hooks/dhcp/stat_cmds/.gitattributes
index 4c71f4d0a8dc97c08ef90fe6bd35c1da92abe0ce..a9c46ae478eb6d86340b93e66170b73b55519a0d 100644 (file)
--- a/src/hooks/dhcp/stat_cmds/.gitattributes
+++ b/src/hooks/dhcp/stat_cmds/.gitattributes
@@ -1,2 +1,2 @@
-/stat_cmds_messages.cc  -diff merge=ours
-/stat_cmds_messages.h   -diff merge=ours
+/stat_cmds_messages.cc           -diff merge=ours
+/stat_cmds_messages.h            -diff merge=ours

diff --git a/src/hooks/dhcp/user_chk/.gitattributes b/src/hooks/dhcp/user_chk/.gitattributes
new file mode 100644 (file)
index 0000000..8e8e8ee
--- /dev/null
+++ b/src/hooks/dhcp/user_chk/.gitattributes
@@ -0,0 +1,2 @@
+/user_chk_messages.cc            -diff merge=ours
+/user_chk_messages.h             -diff merge=ours

diff --git a/src/lib/asiodns/.gitattributes b/src/lib/asiodns/.gitattributes
index d54ab66be3d994269b9b4540157e59e9e620e53f..1dc2d8bcfa4495befa0c8d1495f716fe47d8a07e 100644 (file)
--- a/src/lib/asiodns/.gitattributes
+++ b/src/lib/asiodns/.gitattributes
@@ -1,2 +1,2 @@
-/asiodns_messages.cc    -diff merge=ours
-/asiodns_messages.h     -diff merge=ours
+/asiodns_messages.cc             -diff merge=ours
+/asiodns_messages.h              -diff merge=ours

diff --git a/src/lib/config/.gitattributes b/src/lib/config/.gitattributes
index 4c9efe4a78850b9a1dff901f42db43620b3bf132..789d4e92ffe793df29962d0e76ff48656ded70b6 100644 (file)
--- a/src/lib/config/.gitattributes
+++ b/src/lib/config/.gitattributes
@@ -1,2 +1,2 @@
-/config_messages.cc -diff merge=ours
-/config_messages.h  -diff merge=ours
+/config_messages.cc              -diff merge=ours
+/config_messages.h               -diff merge=ours

diff --git a/src/lib/database/.gitattributes b/src/lib/database/.gitattributes
index a8f0ee43e3e3e8fb964902d39a59dba88b2fe36c..551db060bd5bad66b3f21f66011ea21c60d903fc 100644 (file)
--- a/src/lib/database/.gitattributes
+++ b/src/lib/database/.gitattributes
@@ -1,2 +1,2 @@
-/db_messages.cc -diff merge=ours
-/db_messages.h  -diff merge=ours
+/db_messages.cc                  -diff merge=ours
+/db_messages.h                   -diff merge=ours

diff --git a/src/lib/dhcp_ddns/.gitattributes b/src/lib/dhcp_ddns/.gitattributes
index ef781293ee2e5eab12798043cb73546f9b7dec06..01ea24c8a510b85e6aabc16f2737cf8cbe37b776 100644 (file)
--- a/src/lib/dhcp_ddns/.gitattributes
+++ b/src/lib/dhcp_ddns/.gitattributes
@@ -1,2 +1,2 @@
-/dhcp_ddns_messages.cc  -diff merge=ours
-/dhcp_ddns_messages.h   -diff merge=ours
+/dhcp_ddns_messages.cc           -diff merge=ours
+/dhcp_ddns_messages.h            -diff merge=ours

diff --git a/src/lib/dhcpsrv/.gitattributes b/src/lib/dhcpsrv/.gitattributes
index 27e6f32994ec522551d7c5b1be1f3ca68cc752bf..7b0805b21afa08463372e705d06b9af4541c32ab 100644 (file)
--- a/src/lib/dhcpsrv/.gitattributes
+++ b/src/lib/dhcpsrv/.gitattributes
@@ -1,6 +1,8 @@
-/alloc_engine_messages.cc   -diff merge=ours
-/alloc_engine_messages.h    -diff merge=ours
-/dhcpsrv_messages.cc        -diff merge=ours
-/dhcpsrv_messages.h         -diff merge=ours
-/hosts_messages.cc          -diff merge=ours
-/hosts_messages.h           -diff merge=ours
+/alloc_engine_messages.cc        -diff merge=ours
+/alloc_engine_messages.h         -diff merge=ours
+/dhcpsrv_messages.cc             -diff merge=ours
+/dhcpsrv_messages.h              -diff merge=ours
+/fuzz_messages.cc                -diff merge=ours
+/fuzz_messages.h                 -diff merge=ours
+/hosts_messages.cc               -diff merge=ours
+/hosts_messages.h                -diff merge=ours

diff --git a/src/lib/eval/.gitattributes b/src/lib/eval/.gitattributes
index 77c29a46d84c44bae04ebf9af01de55b8b413784..e1fcf15a3557ced56aceb0ebaff074cc88bfc8e3 100644 (file)
--- a/src/lib/eval/.gitattributes
+++ b/src/lib/eval/.gitattributes
@@ -1,8 +1,8 @@
-/eval_messages.cc   -diff merge=ours
-/eval_messages.h    -diff merge=ours
-/lexer.cc           -diff merge=ours
-/location.hh        -diff merge=ours
-/parser.cc          -diff merge=ours
-/parser.h           -diff merge=ours
-/position.hh        -diff merge=ours
-/stack.hh           -diff merge=ours
+/eval_messages.cc                -diff merge=ours
+/eval_messages.h                 -diff merge=ours
+/lexer.cc                        -diff merge=ours
+/location.hh                     -diff merge=ours
+/parser.cc                       -diff merge=ours
+/parser.h                        -diff merge=ours
+/position.hh                     -diff merge=ours
+/stack.hh                        -diff merge=ours

diff --git a/src/lib/hooks/.gitattributes b/src/lib/hooks/.gitattributes
index 65e0a613b61d61f501e8ca75bda8c42f37c54980..9b633d5e26aed49324bd00d1c7a25ee2dccdba70 100644 (file)
--- a/src/lib/hooks/.gitattributes
+++ b/src/lib/hooks/.gitattributes
@@ -1,2 +1,2 @@
-/hooks_messages.cc  -diff merge=ours
-/hooks_messages.h   -diff merge=ours
+/hooks_messages.cc               -diff merge=ours
+/hooks_messages.h                -diff merge=ours

diff --git a/src/lib/http/.gitattributes b/src/lib/http/.gitattributes
index 5c22bd8450125d18cf734462934867979c1ca7a4..48910f202a69220dec0bb538acde5272edc62193 100644 (file)
--- a/src/lib/http/.gitattributes
+++ b/src/lib/http/.gitattributes
@@ -1,2 +1,2 @@
-/http_messages.cc   -diff merge=ours
-/http_messages.h    -diff merge=ours
+/http_messages.cc                -diff merge=ours
+/http_messages.h                 -diff merge=ours

diff --git a/src/lib/log/tests/.gitattributes b/src/lib/log/tests/.gitattributes
index 0a5c1635d8995df6d4c605509413737c88899761..79f7951a33dc9b67b122830374c8c273c5b421e5 100644 (file)
--- a/src/lib/log/tests/.gitattributes
+++ b/src/lib/log/tests/.gitattributes
@@ -1,2 +1,2 @@
-/log_test_messages.cc   -diff merge=ours
-/log_test_messages.h    -diff merge=ours
+/log_test_messages.cc            -diff merge=ours
+/log_test_messages.h             -diff merge=ours

diff --git a/src/lib/process/.gitattributes b/src/lib/process/.gitattributes
index c4f15640ce895009a7315c7bb40191d29a0b3cb7..410fcc7e92cf1c06c5c6623b4c7fa7039b4a59c9 100644 (file)
--- a/src/lib/process/.gitattributes
+++ b/src/lib/process/.gitattributes
@@ -1,2 +1,2 @@
-/process_messages.cc    -diff merge=ours
-/process_messages.h     -diff merge=ours
+/process_messages.cc             -diff merge=ours
+/process_messages.h              -diff merge=ours