From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8466 invoked by alias); 22 Feb 2013 15:54:15 -0000 Mailing-List: contact archer-help@sourceware.org; run by ezmlm Sender: Precedence: bulk List-Post: List-Help: List-Subscribe: List-Id: Received: (qmail 8456 invoked by uid 22791); 22 Feb 2013 15:54:15 -0000 X-SWARE-Spam-Status: No, hits=-6.7 required=5.0 tests=AWL,BAYES_00,KHOP_RCVD_UNTRUST,KHOP_SPAMHAUS_DROP,RCVD_IN_DNSWL_HI,RCVD_IN_HOSTKARMA_W,RP_MATCHES_RCVD,SPF_HELO_PASS X-Spam-Check-By: sourceware.org From: Tom Tromey To: Jan Kratochvil Cc: Project Archer Subject: Re: Proposal to change branch maintenance References: <874nhipla5.fsf@fleche.redhat.com> <20130213121556.GA21353@host2.jankratochvil.net> <87k3q5d2mp.fsf@fleche.redhat.com> <20130218161949.GB18304@host2.jankratochvil.net> <87wqu5bn6s.fsf@fleche.redhat.com> <20130218170302.GA20180@host2.jankratochvil.net> <87a9r15ljd.fsf@fleche.redhat.com> Date: Fri, 22 Feb 2013 15:54:00 -0000 In-Reply-To: <87a9r15ljd.fsf@fleche.redhat.com> (Tom Tromey's message of "Mon, 18 Feb 2013 15:01:26 -0700") Message-ID: <87621k9wf6.fsf@fleche.redhat.com> User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.2.92 (gnu/linux) MIME-Version: 1.0 Content-Type: text/plain X-SW-Source: 2013-q1/txt/msg00016.txt.bz2 Jan> But I find the 'cat' merge would be best for everyone, even for Jan> other people occasionally possibly doing some archer branch merges. Tom> I'll write this soon. The very simplest way to do this is to add this to your .git/config: [merge "archer"] name = README.archer merger driver = tee -a %A < %B > /dev/null Then make an attributes file like: echo "README.archer merge=archer" >> .git/info/attributes This is slightly ugly since it doesn't separate the various file contents at all. A slightly better option is to put this script on your PATH somewhere: #!/bin/sh # A git merge script for README.archer files. echo >> $1 echo ================================================================ >> $1 cat $2 >> $1 exit 0 Then change the config entry to point to it: [merge "archer"] name = README.archer merger driver = readme-archer %A %B This yields somewhat nicer output. I didn't see a particularly handy way for us to share this, aside from emailing scripts around. So, here it is. Tom