diff --git a/.gitattributes b/.gitattributes
index 9d132e955..169ab48f4 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,5 +1,3 @@
-# Auto detect text files and perform LF normalization
-* text=auto
-
-# Custom for Visual Studio
-*.cs     diff=csharp
+# Auto detect text files and perform LF normalization
+* binary
+
diff --git a/LibGit2Sharp/Core/NativeMethods.cs b/LibGit2Sharp/Core/NativeMethods.cs
index b3e7f1297..469e55773 100644
--- a/LibGit2Sharp/Core/NativeMethods.cs
+++ b/LibGit2Sharp/Core/NativeMethods.cs
@@ -213,8 +213,8 @@ internal static extern unsafe int git_rebase_commit(
             git_rebase* rebase,
             git_signature* author,
             git_signature* committer,
-            IntPtr message_encoding,
-            IntPtr message);
+            [CustomMarshaler(typeof(StrictUtf8Marshaler), typeof(string))] byte* message_encoding,
+            [CustomMarshaler(typeof(StrictUtf8Marshaler), typeof(string))] byte* message);
 
         [DllImport(libgit2)]
         internal static extern unsafe int git_rebase_abort(