[PATCH] Add diff directives to gitattributes

Поиск
Список
Период
Сортировка
От ilmari@ilmari.org (Dagfinn Ilmari Mannsåker)
Тема [PATCH] Add diff directives to gitattributes
Дата
Msg-id d8jzikijba4.fsf@dalvik.ping.uio.no
обсуждение исходный текст
Ответы Re: [PATCH] Add diff directives to gitattributes
Список pgsql-hackers
Hi hackers,

Attached is a patch which adds diff= directives to .gitattributes for C,
Perl and (X|SG)ML files.  This makes word diffs and the function
indicator in the diff chunk header and more useful.

>From 57d7d4ec5b94783bf68b2959128e33c28547a6b8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dagfinn=20Ilmari=20Manns=C3=A5ker?= <ilmari@ilmari.org>
Date: Tue, 29 Nov 2016 19:47:36 +0000
Subject: [PATCH] Add diff directives to .gitattributes

This makes the function indicator in the diff chunk header and word
diffs more useful for the specified languages.
---
 .gitattributes | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.gitattributes b/.gitattributes
index 4dfc131..3805f90 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,11 +1,11 @@
 *        whitespace=space-before-tab,trailing-space
-*.[chly]    whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4
+*.[chly]    whitespace=space-before-tab,trailing-space,indent-with-non-tab,tabwidth=4 diff=cpp
 *.dsl        whitespace=space-before-tab,trailing-space,tab-in-indent
 *.patch        -whitespace
-*.pl        whitespace=space-before-tab,trailing-space,tabwidth=4
+*.pl        whitespace=space-before-tab,trailing-space,tabwidth=4 diff=perl
 *.po        whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eof
-*.sgml        whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eol
-*.x[ms]l    whitespace=space-before-tab,trailing-space,tab-in-indent
+*.sgml        whitespace=space-before-tab,trailing-space,tab-in-indent,-blank-at-eol diff=html
+*.x[ms]l    whitespace=space-before-tab,trailing-space,tab-in-indent diff=html

 # Avoid confusing ASCII underlines with leftover merge conflict markers
 README        conflict-marker-size=32
--
2.7.4


--
"A disappointingly low fraction of the human race is,
 at any given time, on fire." - Stig Sandbeck Mathisen

В списке pgsql-hackers по дате отправления:

Предыдущее
От: Tom Lane
Дата:
Сообщение: Re: move collation import to backend
Следующее
От: Robert Haas
Дата:
Сообщение: Re: Patch: Implement failover on libpq connect level.