From: Tom Tromey <tromey@redhat.com>
To: Jan Kratochvil <jan.kratochvil@redhat.com>
Cc: Project Archer <archer@sourceware.org>
Subject: Re: Proposal to change branch maintenance
Date: Fri, 22 Feb 2013 15:54:00 -0000 [thread overview]
Message-ID: <87621k9wf6.fsf@fleche.redhat.com> (raw)
In-Reply-To: <87a9r15ljd.fsf@fleche.redhat.com> (Tom Tromey's message of "Mon, 18 Feb 2013 15:01:26 -0700")
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
next prev parent reply other threads:[~2013-02-22 15:54 UTC|newest]
Thread overview: 23+ messages / expand[flat|nested] mbox.gz Atom feed top
2013-02-11 21:56 Tom Tromey
2013-02-13 11:32 ` Gary Benson
2013-02-13 12:16 ` Jan Kratochvil
2013-02-13 12:33 ` Pedro Alves
2013-02-13 12:53 ` Gary Benson
2013-02-18 16:10 ` Tom Tromey
2013-02-18 16:20 ` Jan Kratochvil
2013-02-18 16:29 ` Tom Tromey
2013-02-18 17:03 ` Jan Kratochvil
2013-02-18 17:40 ` Tom Tromey
2013-02-18 22:01 ` Tom Tromey
2013-02-22 15:54 ` Tom Tromey [this message]
2013-02-26 17:33 ` Tom Tromey
2013-02-26 20:13 ` Tom Tromey
2013-02-26 20:31 ` Sergio Durigan Junior
2013-02-27 20:50 ` Tom Tromey
2013-02-27 20:50 ` Tom Tromey
2013-02-27 21:15 ` Tom Tromey
2013-02-18 11:46 ` Sergio Durigan Junior
2013-02-18 16:11 ` Tom Tromey
2013-02-18 16:16 ` Jan Kratochvil
2013-02-22 15:06 ` Tom Tromey
2013-02-22 21:27 ` Tom Tromey
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87621k9wf6.fsf@fleche.redhat.com \
--to=tromey@redhat.com \
--cc=archer@sourceware.org \
--cc=jan.kratochvil@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).