From mboxrd@z Thu Jan 1 00:00:00 1970 Path: news.gmane.org!not-for-mail From: =?ISO-8859-1?Q?R=FCdiger?= Sonderfeld Newsgroups: gmane.emacs.devel Subject: Re: This Is The Git Help Mailing List Date: Fri, 05 Dec 2014 17:03:59 +0100 Message-ID: <2849552.Jb2DAzm063@descartes> References: <87tx1aoh6p.fsf@lifelogs.com> NNTP-Posting-Host: plane.gmane.org Mime-Version: 1.0 Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable X-Trace: ger.gmane.org 1417795468 32151 80.91.229.3 (5 Dec 2014 16:04:28 GMT) X-Complaints-To: usenet@ger.gmane.org NNTP-Posting-Date: Fri, 5 Dec 2014 16:04:28 +0000 (UTC) Cc: Ted Zlatanov To: emacs-devel@gnu.org Original-X-From: emacs-devel-bounces+ged-emacs-devel=m.gmane.org@gnu.org Fri Dec 05 17:04:22 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 1XwvMk-0001p0-17 for ged-emacs-devel@m.gmane.org; Fri, 05 Dec 2014 17:04:22 +0100 Original-Received: from localhost ([::1]:51168 helo=lists.gnu.org) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwvMj-0006gN-HB for ged-emacs-devel@m.gmane.org; Fri, 05 Dec 2014 11:04:21 -0500 Original-Received: from eggs.gnu.org ([2001:4830:134:3::10]:45109) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwvMa-0006fx-OA for emacs-devel@gnu.org; Fri, 05 Dec 2014 11:04:18 -0500 Original-Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1XwvMU-0006S8-D3 for emacs-devel@gnu.org; Fri, 05 Dec 2014 11:04:12 -0500 Original-Received: from ptmx.org ([178.63.28.110]:57174) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1XwvMU-0006S2-7g for emacs-devel@gnu.org; Fri, 05 Dec 2014 11:04:06 -0500 Original-Received: from localhost (localhost [127.0.0.1]) by ptmx.org (Postfix) with ESMTP id E61362D8EB; Fri, 5 Dec 2014 17:04:04 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at ptmx.org Original-Received: from ptmx.org ([127.0.0.1]) by localhost (ptmx.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QrH11eb4J0QO; Fri, 5 Dec 2014 17:04:02 +0100 (CET) Original-Received: from descartes.localnet (chello080109100138.16.15.univie.teleweb.at [80.109.100.138]) by ptmx.org (Postfix) with ESMTPSA id 845C22C92C; Fri, 5 Dec 2014 17:04:02 +0100 (CET) User-Agent: KMail/4.13.3 (Linux/3.13.0-40-generic; KDE/4.13.3; x86_64; ; ) In-Reply-To: <87tx1aoh6p.fsf@lifelogs.com> X-detected-operating-system: by eggs.gnu.org: GNU/Linux 2.6.x X-Received-From: 178.63.28.110 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:178949 Archived-At: On Thursday 04 December 2014 23:26:38 Ted Zlatanov wrote: > and then in ~/.gitattributes : >=20 > ChangeLog merge=3Dmerge-changelog > *.el diff=3Dlisp You can also add custom hunk headers for C code (builtin: diff=3Dcpp) a= nd=20 texinfo (requires another xfuncname). See: http://www.emacswiki.org/emacs/GitForEmacsDevs#UsefulAddOns (A collection of other xfuncname and gitattributes, I started:=20 https://gist.github.com/ruediger/5647207 ) > That has been helpful for me. The core.attributesfile setting is fai= rly > new, though, so get the latest git. The default value is $XDG_CONFIG_HOME/git/attributes (with XDG_CONFIG_H= OME=20 defaulting to ~/.config if unset). That way there are less files pollu= ting ~ Regards, R=C3=BCdiger