From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: Ted Zlatanov Newsgroups: gmane.emacs.devel Subject: Re: This Is The Git Help Mailing List Date: Thu, 04 Dec 2014 23:26:38 -0500 Organization: =?utf-8?B?0KLQtdC+0LTQvtGAINCX0LvQsNGC0LDQvdC+0LI=?= @ Cienfuegos Message-ID: <87tx1aoh6p.fsf@lifelogs.com> References: <87zjb3j6f1.fsf@mail.linkov.net> Reply-To: emacs-devel@gnu.org NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain X-Trace: ger.gmane.org 1417753845 19369 80.91.229.3 (5 Dec 2014 04:30:45 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 5 Dec 2014 04:30:45 +0000 (UTC) To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 05 05:30:37 2014 Return-path: Envelope-to: ged-emacs-devel@m.gmane.org Original-Received: from lists.gnu.org ([208.118.235.17]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1XwkXL-0002oE-EX for ged-emacs-devel@m.gmane.org; Fri, 05 Dec 2014 05:30:35 +0100 Original-Received: from localhost ([::1]:48761 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwkXK-0004cF-S6 for ged-emacs-devel@m.gmane.org; Thu, 04 Dec 2014 23:30:34 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:47276) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwkWx-0004by-2N for emacs-devel@gnu.org; Thu, 04 Dec 2014 23:30:16 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwkWr-0006f4-7J for emacs-devel@gnu.org; Thu, 04 Dec 2014 23:30:11 -0500 Original-Received: from plane.gmane.org ([80.91.229.3]:36522) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwkWr-0006cp-1m for emacs-devel@gnu.org; Thu, 04 Dec 2014 23:30:05 -0500 Original-Received: from list by plane.gmane.org with local (Exim 4.69) (envelope-from ) id 1XwkWo-0002X7-Jw for emacs-devel@gnu.org; Fri, 05 Dec 2014 05:30:02 +0100 Original-Received: from c-98-229-61-72.hsd1.ma.comcast.net ([98.229.61.72]) by main.gmane.org with esmtp (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 05 Dec 2014 05:30:02 +0100 Original-Received: from tzz by c-98-229-61-72.hsd1.ma.comcast.net with local (Gmexim 0.1 (Debian)) id 1AlnuQ-0007hv-00 for ; Fri, 05 Dec 2014 05:30:02 +0100 X-Injected-Via-Gmane: http://gmane.org/ Mail-Followup-To: emacs-devel@gnu.org Original-Lines: 28 Original-X-Complaints-To: usenet@ger.gmane.org X-Gmane-NNTP-Posting-Host: c-98-229-61-72.hsd1.ma.comcast.net X-Face: bd.DQ~'29fIs`T_%O%C\g%6jW)yi[zuz6; d4V0`@y-~$#3P_Ng{@m+e4o<4P'#(_GJQ%TT= D}[Ep*b!\e,fBZ'j_+#"Ps?s2!4H2-Y"sx" Mail-Copies-To: never User-Agent: Gnus/5.130012 (Ma Gnus v0.12) Emacs/25.0.50 (gnu/linux) Cancel-Lock: sha1:f9H/j4UCj3vt1kj8UYfsMjeCJyg= X-detected-operating-system: by eggs.gnu.org: Genre and OS details not recognized. X-Received-From: 80.91.229.3 X-BeenThere: emacs-devel@gnu.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Emacs development discussions." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Original-Sender: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Xref: news.gmane.org gmane.emacs.devel:178880 Archived-At: On Thu, 04 Dec 2014 21:04:47 -0500 Stefan Monnier wrote: >> I wonder why we still don't have in emacs/.gitattributes this line? SM> Probably because noone did it. SM> Stefan "who knows nothing about .gitattributes" For general use (not just inside Emacs) put this in ~/.gitconfig : [core] attributesfile = ~/.gitattributes [diff "lisp"] xfuncname = "^(\\(.*)$" [merge "merge-changelog"] name = GNU-style ChangeLog merge driver driver = /usr/local/bin/git-merge-changelog %O %A %B and then in ~/.gitattributes : ChangeLog merge=merge-changelog *.el diff=lisp That has been helpful for me. The core.attributesfile setting is fairly new, though, so get the latest git. Ted