From mboxrd@z Thu Jan 1 00:00:00 1970 From: martin f krafft Subject: Re: merging .gitignore Date: Tue, 2 Oct 2007 21:20:23 +0100 Message-ID: <20071002202023.GA16010@lapse.madduck.net> References: <20071001130314.GA5932@lapse.madduck.net> <20071001130314.GA5932@lapse.madduck.net> <200710011448.17701.andyparkins@gmail.com> <20071002195148.GA14171@lapse.madduck.net> <7vodfhjnpe.fsf@gitster.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="FL5UXtIhxfXey3p5" To: Junio C Hamano , git@vger.kernel.org, Andy Parkins , Johannes Schindelin X-From: git-owner@vger.kernel.org Tue Oct 02 22:22:20 2007 Return-path: Envelope-to: gcvg-git-2@gmane.org Received: from vger.kernel.org ([209.132.176.167]) by lo.gmane.org with esmtp (Exim 4.50) id 1IcoFr-0005eZ-GV for gcvg-git-2@gmane.org; Tue, 02 Oct 2007 22:22:07 +0200 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753580AbXJBUWA (ORCPT ); Tue, 2 Oct 2007 16:22:00 -0400 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753528AbXJBUWA (ORCPT ); Tue, 2 Oct 2007 16:22:00 -0400 Received: from clegg.madduck.net ([82.197.162.59]:44448 "EHLO clegg.madduck.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753447AbXJBUV7 (ORCPT ); Tue, 2 Oct 2007 16:21:59 -0400 Received: from lapse.madduck.net (213-202-173-105.bas504.dsl.esat.net [213.202.173.105]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "lapse.madduck.net", Issuer "CAcert Class 3 Root" (verified OK)) by clegg.madduck.net (postfix) with ESMTP id 7DC9DBA383; Tue, 2 Oct 2007 22:21:41 +0200 (CEST) Received: by lapse.madduck.net (Postfix, from userid 1000) id 4A9B33FDED; Tue, 2 Oct 2007 21:20:23 +0100 (BST) Content-Disposition: inline In-Reply-To: <7vodfhjnpe.fsf@gitster.siamese.dyndns.org> X-Motto: Keep the good times rollin' X-OS: Debian GNU/Linux lenny/sid kernel 2.6.22-2-686 i686 X-Spamtrap: madduck.bogus@madduck.net X-Subliminal-Message: debian/rules! User-Agent: Mutt/1.5.16 (2007-06-11) X-Virus-Scanned: ClamAV 0.91.2/4456/Tue Oct 2 17:11:59 2007 on clegg.madduck.net X-Virus-Status: Clean Sender: git-owner@vger.kernel.org Precedence: bulk X-Mailing-List: git@vger.kernel.org Archived-At: --FL5UXtIhxfXey3p5 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable also sprach Junio C Hamano [2007.10.02.2055 +0100]: > Perhaps you can use the existing union merge there. Many thanks for the pointer, I did not even have time to look at gitattributes.txt yet... --=20 martin; (greetings from the heart of the sun.) \____ echo mailto: !#^."<*>"|tr "<*> mailto:" net@madduck =20 "self-denial is the shining sore on the leprous body of christianity." -- oscar wilde =20 spamtraps: madduck.bogus@madduck.net --FL5UXtIhxfXey3p5 Content-Type: application/pgp-signature; name="digital_signature_gpg.asc" Content-Description: Digital signature (see http://martin-krafft.net/gpg/) Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.6 (GNU/Linux) iD8DBQFHAqgHIgvIgzMMSnURAtIjAJ4sMSiM1nDWGLjlN910A1RlCSPzlACgk6L+ RlR7X6WYKSIaRBsQurwP0SE= =r8kL -----END PGP SIGNATURE----- --FL5UXtIhxfXey3p5--