From 6fdc9ca742cc672332a5ee8afe52765f842df525 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Fri, 4 Dec 2015 11:45:55 +0100 Subject: [PATCH] git: handle patch files as binary --- .gitattributes | 1 + 1 file changed, 1 insertion(+) diff --git a/.gitattributes b/.gitattributes index 3c04f4f99f..9ebeba4883 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,4 +1,5 @@ *.a binary +*.patch binary # Default conflict marker size is 7 which causes some of the headings in # release-notes.txt to trigger git diff --check: 'leftover conflict marker' # when the heading is exactly 7 characters long.