2020-04-17 13:51:57 +00:00
|
|
|
From 0b805df7403257a71b9852deb2f468aac16133b0 Mon Sep 17 00:00:00 2001
|
2020-01-18 11:43:26 +00:00
|
|
|
From: "Richard W.M. Jones" <rjones@redhat.com>
|
|
|
|
|
Date: Sat, 18 Jan 2020 11:31:27 +0000
|
2020-04-17 13:51:57 +00:00
|
|
|
Subject: [PATCH 4/4] Remove configure from .gitattributes.
|
2020-01-18 11:43:26 +00:00
|
|
|
|
|
|
|
|
It's not a binary file.
|
|
|
|
|
---
|
|
|
|
|
.gitattributes | 4 ----
|
|
|
|
|
1 file changed, 4 deletions(-)
|
|
|
|
|
|
|
|
|
|
diff --git a/.gitattributes b/.gitattributes
|
2020-04-17 13:51:57 +00:00
|
|
|
index db37bfbe5..b6e540188 100644
|
2020-01-18 11:43:26 +00:00
|
|
|
--- a/.gitattributes
|
|
|
|
|
+++ b/.gitattributes
|
|
|
|
|
@@ -29,10 +29,6 @@
|
|
|
|
|
|
|
|
|
|
/boot/menhir/parser.ml* -diff
|
|
|
|
|
|
|
|
|
|
-# configure is declared as binary so that it doesn't get included in diffs.
|
|
|
|
|
-# This also means it will have the correct Unix line-endings, even on Windows.
|
|
|
|
|
-/configure binary
|
|
|
|
|
-
|
|
|
|
|
# 'union' merge driver just unions textual content in case of conflict
|
|
|
|
|
# http://krlmlr.github.io/using-gitattributes-to-avoid-merge-conflicts/
|
|
|
|
|
/.mailmap merge=union
|
|
|
|
|
--
|
2020-04-11 17:20:06 +00:00
|
|
|
2.24.1
|
2020-01-18 11:43:26 +00:00
|
|
|
|
