diff --git a/gdb/.gitattributes b/gdb/.gitattributes
new file mode 100644
index 00000000000..8acadb9813e
--- /dev/null
+++ b/gdb/.gitattributes
@@ -0,0 +1,7 @@
+# -*- conf -*-
+
+# Use cpp-style diffs for .h and .c files.  This is useful
+# if you modify classes defined in those files.
+
+*.h	diff=cpp
+*.c	diff=cpp
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 22e500c1b3c..d8c44d80e4e 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-05  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
+
+	* .gitattributes: New file.
+
 2020-03-04  Tom Tromey  <tom@tromey.com>
 
 	* symmisc.c (print_symbol_bcache_statistics)
diff --git a/gdbserver/.gitattributes b/gdbserver/.gitattributes
new file mode 100644
index 00000000000..6df25746593
--- /dev/null
+++ b/gdbserver/.gitattributes
@@ -0,0 +1,6 @@
+# -*- conf -*-
+
+# Use cpp-style diffs for .h files.  This is useful
+# if you modify classes defined in a header file.
+
+*.h	diff=cpp
diff --git a/gdbserver/ChangeLog b/gdbserver/ChangeLog
index 7a5a3b7a037..4e44a763cc3 100644
--- a/gdbserver/ChangeLog
+++ b/gdbserver/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-05  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
+
+	* .gitattributes: New file.
+
 2020-03-02  Andrew Burgess  <andrew.burgess@embecosm.com>
 
 	* remote-utils.cc (prepare_resume_reply): Add ability to convert T
diff --git a/gdbsupport/.gitattributes b/gdbsupport/.gitattributes
new file mode 100644
index 00000000000..6df25746593
--- /dev/null
+++ b/gdbsupport/.gitattributes
@@ -0,0 +1,6 @@
+# -*- conf -*-
+
+# Use cpp-style diffs for .h files.  This is useful
+# if you modify classes defined in a header file.
+
+*.h	diff=cpp
diff --git a/gdbsupport/ChangeLog b/gdbsupport/ChangeLog
index 033be86b185..c47bb4ebbba 100644
--- a/gdbsupport/ChangeLog
+++ b/gdbsupport/ChangeLog
@@ -1,3 +1,7 @@
+2020-03-05  Tankut Baris Aktemur  <tankut.baris.aktemur@intel.com>
+
+	* .gitattributes: New file.
+
 2020-03-03  Simon Marchi  <simon.marchi@efficios.com>
 
 	* Makefile.in: Re-generate.