[#1462] .gitattributes

21 files changed, 83 insertions, 0 deletions

diff --git a/src/bin/admin/.gitattributes b/src/bin/admin/.gitattributes
new file mode 100644
index 0000000000..5601c44d56
--- /dev/null
+++ b/src/bin/admin/.gitattributes
@@ -0,0 +1,2 @@
+/messages.cc    -diff merge=ours
+/messages.h     -diff merge=ours
diff --git a/src/bin/agent/.gitattributes b/src/bin/agent/.gitattributes
new file mode 100644
index 0000000000..718527940f
--- /dev/null
+++ b/src/bin/agent/.gitattributes
@@ -0,0 +1,9 @@
+/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
diff --git a/src/bin/d2/.gitattributes b/src/bin/d2/.gitattributes
new file mode 100644
index 0000000000..2f739dc3f6
--- /dev/null
+++ b/src/bin/d2/.gitattributes
@@ -0,0 +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
diff --git a/src/bin/dhcp4/.gitattributes b/src/bin/dhcp4/.gitattributes
new file mode 100644
index 0000000000..85d246b5b3
--- /dev/null
+++ b/src/bin/dhcp4/.gitattributes
@@ -0,0 +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
diff --git a/src/bin/dhcp6/.gitattributes b/src/bin/dhcp6/.gitattributes
new file mode 100644
index 0000000000..7e07bbc4bb
--- /dev/null
+++ b/src/bin/dhcp6/.gitattributes
@@ -0,0 +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
diff --git a/src/bin/lfc/.gitattributes b/src/bin/lfc/.gitattributes
new file mode 100644
index 0000000000..ae10a519d5
--- /dev/null
+++ b/src/bin/lfc/.gitattributes
@@ -0,0 +1,2 @@
+/lfc_messages.cc    -diff merge=ours
+/lfc_messages.h     -diff merge=ours
diff --git a/src/bin/netconf/.gitattributes b/src/bin/netconf/.gitattributes
new file mode 100644
index 0000000000..393bc7da49
--- /dev/null
+++ b/src/bin/netconf/.gitattributes
@@ -0,0 +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
diff --git a/src/hooks/dhcp/high_availability/.gitattributes b/src/hooks/dhcp/high_availability/.gitattributes
new file mode 100644
index 0000000000..12dbde4b35
--- /dev/null
+++ b/src/hooks/dhcp/high_availability/.gitattributes
@@ -0,0 +1,2 @@
+/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
new file mode 100644
index 0000000000..62f0b93729
--- /dev/null
+++ b/src/hooks/dhcp/lease_cmds/.gitattributes
@@ -0,0 +1,2 @@
+/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
new file mode 100644
index 0000000000..04833b3d8b
--- /dev/null
+++ b/src/hooks/dhcp/mysql_cb/.gitattributes
@@ -0,0 +1,2 @@
+/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
new file mode 100644
index 0000000000..4c71f4d0a8
--- /dev/null
+++ b/src/hooks/dhcp/stat_cmds/.gitattributes
@@ -0,0 +1,2 @@
+/stat_cmds_messages.cc  -diff merge=ours
+/stat_cmds_messages.h   -diff merge=ours
diff --git a/src/lib/asiodns/.gitattributes b/src/lib/asiodns/.gitattributes
new file mode 100644
index 0000000000..d54ab66be3
--- /dev/null
+++ b/src/lib/asiodns/.gitattributes
@@ -0,0 +1,2 @@
+/asiodns_messages.cc    -diff merge=ours
+/asiodns_messages.h     -diff merge=ours
diff --git a/src/lib/config/.gitattributes b/src/lib/config/.gitattributes
new file mode 100644
index 0000000000..4c9efe4a78
--- /dev/null
+++ b/src/lib/config/.gitattributes
@@ -0,0 +1,2 @@
+/config_messages.cc -diff merge=ours
+/config_messages.h  -diff merge=ours
diff --git a/src/lib/database/.gitattributes b/src/lib/database/.gitattributes
new file mode 100644
index 0000000000..a8f0ee43e3
--- /dev/null
+++ b/src/lib/database/.gitattributes
@@ -0,0 +1,2 @@
+/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
new file mode 100644
index 0000000000..ef781293ee
--- /dev/null
+++ b/src/lib/dhcp_ddns/.gitattributes
@@ -0,0 +1,2 @@
+/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
new file mode 100644
index 0000000000..27e6f32994
--- /dev/null
+++ b/src/lib/dhcpsrv/.gitattributes
@@ -0,0 +1,6 @@
+/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
diff --git a/src/lib/eval/.gitattributes b/src/lib/eval/.gitattributes
new file mode 100644
index 0000000000..77c29a46d8
--- /dev/null
+++ b/src/lib/eval/.gitattributes
@@ -0,0 +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
diff --git a/src/lib/hooks/.gitattributes b/src/lib/hooks/.gitattributes
new file mode 100644
index 0000000000..65e0a613b6
--- /dev/null
+++ b/src/lib/hooks/.gitattributes
@@ -0,0 +1,2 @@
+/hooks_messages.cc  -diff merge=ours
+/hooks_messages.h   -diff merge=ours
diff --git a/src/lib/http/.gitattributes b/src/lib/http/.gitattributes
new file mode 100644
index 0000000000..5c22bd8450
--- /dev/null
+++ b/src/lib/http/.gitattributes
@@ -0,0 +1,2 @@
+/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
new file mode 100644
index 0000000000..0a5c1635d8
--- /dev/null
+++ b/src/lib/log/tests/.gitattributes
@@ -0,0 +1,2 @@
+/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
new file mode 100644
index 0000000000..c4f15640ce
--- /dev/null
+++ b/src/lib/process/.gitattributes
@@ -0,0 +1,2 @@
+/process_messages.cc    -diff merge=ours
+/process_messages.h     -diff merge=ours