Re: Proposal to change branch maintenance

[Tom Tromey <tromey at redhat dot com>]

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